diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-09 16:30:35 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-09 16:30:35 +0000 |
| commit | e59d23ad103f8915a264befc855cee1bed2e80e4 (patch) | |
| tree | 7d438d8bb0eff9ff49792320ddb42de603122c79 /c/src/make | |
| parent | 2008-09-09 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-e59d23ad103f8915a264befc855cee1bed2e80e4.tar.bz2 | |
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.
Diffstat (limited to 'c/src/make')
| -rw-r--r-- | c/src/make/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/make/compilers/gcc-target-default.cfg | 18 | ||||
| -rw-r--r-- | c/src/make/leaf.cfg | 4 |
3 files changed, 9 insertions, 19 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index 1444711341..5d6d380cf2 100644 --- a/c/src/make/ChangeLog +++ b/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. diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg index b2472c2cb9..e4e8172bb5 100644 --- a/c/src/make/compilers/gcc-target-default.cfg +++ b/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 diff --git a/c/src/make/leaf.cfg b/c/src/make/leaf.cfg index 1e5f0cbbd5..2e9b102323 100644 --- a/c/src/make/leaf.cfg +++ b/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 |