diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-01 16:51:41 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-09-01 16:51:41 +0000 |
| commit | 75705de7da5835daa82de8f7b4367e74e394b306 (patch) | |
| tree | e3df2269fd519d8902b71015555d5e8e2ca0a294 /gnattools | |
| parent | d212dd7b4a712ad155eaa241b0c79f33a9e108f5 (diff) | |
| download | gcc-75705de7da5835daa82de8f7b4367e74e394b306.tar.gz | |
PR ada/58239
gnattools/
* Makefile.in (CXX_LFLAGS): New.
(TOOLS_FLAGS_TO_PASS_NATIVE): Pass CXX and CXX_LFLAGS.
(TOOLS_FLAGS_TO_PASS_RE): Likewise.
(TOOLS_FLAGS_TO_PASS_CROSS): Pass CXX.
gcc/ada/
* gcc-interface/Makefile.in (GCC_LINK_FLAGS): Add -static-libstdc++.
(GCC_LINK): Use CXX instead of CC.
* gcc-interface/Make-lang.in (CXX_LFLAGS): New.
(ADA_TOOLS_FLAGS_TO_PASS): Pass CXX, and CXX_LFLAGS for native.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202150 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gnattools')
| -rw-r--r-- | gnattools/ChangeLog | 9 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index d7333c60b85..a1e7b9a32b8 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,12 @@ +2013-09-01 Eric Botcazou <ebotcazou@adacore.com> + Iain Sandoe <iain@codesourcery.com> + + PR ada/58239 + * Makefile.in (CXX_LFLAGS): New. + (TOOLS_FLAGS_TO_PASS_NATIVE): Pass CXX and CXX_LFLAGS. + (TOOLS_FLAGS_TO_PASS_RE): Likewise. + (TOOLS_FLAGS_TO_PASS_CROSS): Pass CXX. + 2012-03-14 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.ac (mips-sgi-irix*): Remove. diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 794d374e75e..fdd649194df 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -63,9 +63,16 @@ INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \ -I$(fsrcdir)/../include -I$(fsrcdir) ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada +CXX_LFLAGS = \ + -B../../../$(target_noncanonical)/libstdc++-v3/src/.libs \ + -B../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs \ + -L../../../$(target_noncanonical)/libstdc++-v3/src/.libs \ + -L../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs + # Variables for gnattools, native TOOLS_FLAGS_TO_PASS_NATIVE= \ "CC=../../xgcc -B../../" \ + "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "ADAFLAGS=$(ADAFLAGS)" \ @@ -83,6 +90,7 @@ TOOLS_FLAGS_TO_PASS_NATIVE= \ # Variables for regnattools TOOLS_FLAGS_TO_PASS_RE= \ "CC=../../xgcc -B../../" \ + "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ "CFLAGS=$(CFLAGS)" \ "ADAFLAGS=$(ADAFLAGS)" \ "ADA_CFLAGS=$(ADA_CFLAGS)" \ @@ -99,6 +107,7 @@ TOOLS_FLAGS_TO_PASS_RE= \ # Variables for gnattools, cross TOOLS_FLAGS_TO_PASS_CROSS= \ "CC=$(CC)" \ + "CXX=$(CXX)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "ADAFLAGS=$(ADAFLAGS)" \ |