diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2013-04-23 16:16:03 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-04-23 18:16:03 +0200 |
| commit | 2a30e7e2001708f13abf0fb27dd354377a674845 (patch) | |
| tree | 115f558ae4e5f8de8e437247797157bf1a4605d4 /gcc/ada | |
| parent | 2921237485ab2b10a296a7e28b33a3894d32dfb4 (diff) | |
| download | gcc-2a30e7e2001708f13abf0fb27dd354377a674845.zip gcc-2a30e7e2001708f13abf0fb27dd354377a674845.tar.gz gcc-2a30e7e2001708f13abf0fb27dd354377a674845.tar.bz2 | |
Makefile.in (targ): Fix target name check.
2013-04-23 Eric Botcazou <ebotcazou@adacore.com>
Pascal Obry <obry@adacore.com>
* gcc-interface/Makefile.in (targ): Fix target name check.
(../../gnatmake$(exeext)): Add '+' for LTO.
(../../gnatlink$(exeext)): Likewise.
Co-Authored-By: Pascal Obry <obry@adacore.com>
From-SVN: r198200
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f914728..3992484 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2013-04-23 Eric Botcazou <ebotcazou@adacore.com> + Pascal Obry <obry@adacore.com> + + * gcc-interface/Makefile.in (targ): Fix target name check. + (../../gnatmake$(exeext)): Add '+' for LTO. + (../../gnatlink$(exeext)): Likewise. + 2013-04-23 Hristian Kirtchev <kirtchev@adacore.com> * exp_ch9.adb (Build_PPC_Wrapper): Correct the traversal of diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index b5c4fb4..94ac634 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -259,7 +259,7 @@ TOOLS_LIBS = targext.o link.o ../../ggc-none.o ../../libcommon-target.a \ # manufacturer, and operating system and assign each of those to its own # variable. host:=$(subst -, ,$(host_canonical)) -targ:=$(subst -, ,$(target)) +targ:=$(subst -, ,$(subst -gnu, ,$(target_alias))) arch:=$(word 1,$(targ)) ifeq ($(words $(targ)),2) manu:= @@ -2519,11 +2519,11 @@ gnatlink-re: ../stamp-tools link.o targext.o gnatmake-re # Likewise for the tools ../../gnatmake$(exeext): $(P) b_gnatm.o link.o targext.o $(GNATMAKE_OBJS) - $(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) \ + +$(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) \ $(TOOLS_LIBS) ../../gnatlink$(exeext): $(P) b_gnatl.o link.o targext.o $(GNATLINK_OBJS) - $(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) \ + +$(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) \ $(TOOLS_LIBS) ../stamp-gnatlib-$(RTSDIR): |