diff options
Diffstat (limited to 'c/src/make')
| -rw-r--r-- | c/src/make/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/make/leaf.cfg | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/c/src/make/ChangeLog b/c/src/make/ChangeLog index 5d6d380cf2..1b88cd8f0f 100644 --- a/c/src/make/ChangeLog +++ b/c/src/make/ChangeLog @@ -1,3 +1,9 @@ +2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com> + + * leaf.cfg: LINK.c and LINK.cc include LDFLAGS so do not include it in + make-exe and make-cxx-exe definitions. This was resulting in the + linker script being processed twice and breaking some BSPs. + 2008-09-09 Joel Sherrill <joel.sherrill@OARcorp.com> * leaf.cfg, compilers/gcc-target-default.cfg: Remove use of AM_LDFLAGS. diff --git a/c/src/make/leaf.cfg b/c/src/make/leaf.cfg index 2e9b102323..1e5f0cbbd5 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) $(LDFLAGS) \ + $(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) endef define bsp-link-cxx - $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + $(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \ -o $(basename $@).exe $(LINK_OBJS) $(LINK_LIBS) endef |