2008-09-09 Joel Sherrill <joel.sherrill@OARcorp.com>

* leaf.cfg, compilers/gcc-target-default.cfg: Remove use of AM_LDFLAGS.
	Ensure LDFLAGS works all the time. Clean up BSPs which defined their
	own make-exe rules inappropriately.

c/src/make/ChangeLog

@@ -1,3 +1,9 @@
+2008-09-09	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* leaf.cfg, compilers/gcc-target-default.cfg: Remove use of AM_LDFLAGS.
+	Ensure LDFLAGS works all the time. Clean up BSPs which defined their
+	own make-exe rules inappropriately.
+
 2008-05-20	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* leaf.cfg: Do not override bsp-post-link.

c/src/make/compilers/gcc-target-default.cfg

@@ -70,27 +70,11 @@ endif
 # List of library paths without -L
 LD_PATHS= $(PROJECT_RELEASE)/lib
 
-# libraries you want EVERYONE to link with
-#LD_LIBS=
-
-# ld flag to ensure pure-text
-#LDFLAGS_MUST_BE_PURE_V =
-
-# ld flag for [un]shared objects
-#LDFLAGS_STATIC_LIBRARIES_V =
-#LDFLAGS_SHARED_LIBRARIES_V =
-
 # ld flag for incomplete link
 LDFLAGS_INCOMPLETE = -r
 
-# Special linker options when building lib.so
-LDFLAGS_DYNAMIC_V = ??
-
-# Some dynamic linking systems want the preferred name recorded in the binary
-LDFLAGS_DYNAMIC_LIBNAME_V = -h $(DYNAMIC_VERSION_LIBNAME)
-
 # LDFLAGS=$(LDFLAGS_DEBUG) $(LD_PATHS:%=-L%)
-LDFLAGS=$(LDFLAGS_DEBUG)
+LDFLAGS += $(LDFLAGS_DEBUG)
 
 #
 # Stuff to clean and clobber for the compiler and its tools

c/src/make/leaf.cfg

@@ -66,12 +66,12 @@ endif
 DOWNEXT=.ralf
 
 define bsp-link-c
-	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	    -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS)
 endef
 
 define bsp-link-cxx
-	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	    -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS)
 endef