[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [haiku-commits] r40739 - haiku/trunk/data/develop
From:       zharik () gmx ! li
Date:       2011-02-28 19:17:55
Message-ID: 20110228191755.411746805E () vmsvn ! haiku-os ! org
[Download RAW message or body]

Author: siarzhuk
Date: 2011-02-28 20:17:55 +0100 (Mon, 28 Feb 2011)
New Revision: 40739
Changeset: http://dev.haiku-os.org/changeset/40739

Modified:
   haiku/trunk/data/develop/makefile-engine
Log:
A workaround for compatibility problem, originated from r40300 changes.
Proposed in it "LD ?= gcc" assignment doesn't works both with existing
makefiles and with current version of the makefile template. User must 
define LD in it's makefile to let them work. That is bad.

This workaround uses $origin function to check for redefinition of LD
variable in user's makefile.



Modified: haiku/trunk/data/develop/makefile-engine
===================================================================
--- haiku/trunk/data/develop/makefile-engine	2011-02-28 18:36:07 UTC (rev 40738)
+++ haiku/trunk/data/develop/makefile-engine	2011-02-28 19:17:55 UTC (rev 40739)
@@ -79,7 +79,9 @@
 	endif
 
 #	set the linker and linker flags
-	LD			?= gcc
+ifeq ($(origin LD), default)
+	LD			:= gcc
+endif
 	LDFLAGS		+= $(DEBUG)
 
 #	SETTING: set linker flags for each binary type


[prev in list] [next in list] [prev in thread] [next in thread]