diff options
Diffstat (limited to 'gcc/ada/gcc-interface/Make-lang.in')
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index fd44eb8..478272f 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -128,11 +128,12 @@ ada: gnat1$(exeext) gnatbind$(exeext) # Tell GNU Make to ignore these, if they exist. .PHONY: 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 +# Compute the FLAGS to pass for gnattools, now linked with a C++ driver as +# we're linking against at least libcommon which contains C++ compiled code. +# We need to use the same driver to link as the one that was used to produce +# the objects, which depends on whether we're bootstrapping or not. The CXX +# variable conveys what we need for this, set to "g++" if not bootstrapping, +# ".../xg++" otherwise. # There are too many Ada sources to check against here. Let's # always force the recursive make. @@ -142,7 +143,7 @@ ifeq ($(build), $(host)) # tree. ADA_TOOLS_FLAGS_TO_PASS=\ CC="../../xgcc -B../../" \ - CXX="../../xg++ -B../../ $(CXX_LFLAGS)" \ + CXX="$(CXX)" \ $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ ADA_INCLUDES="-I- -I../rts" \ GNATMAKE="../../gnatmake" \ |