diff options
| -rw-r--r-- | gnattools/ChangeLog | 16 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 13 |
2 files changed, 24 insertions, 5 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index 3aa0461..ca75cf0 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,19 @@ +2018-11-06 Eric Botcazou <ebotcazou@adacore.com> + + PR ada/81878 + Revert + 2018-10-29 Tamar Christina <tamar.christina@arm.com> + + PR ada/81878 + * Makefile.in (TOOLS_FLAGS_TO_PASS_NATIVE): Add -B ../../. + + 2017-08-17 Richard Biener <rguenther@suse.de> + + PR ada/81878 + * Makefile.in (CXX_LFLAGS): Remove. + (TOOLS_FLAGS_TO_PASS_NATIVE): Pass $(CXX) as CXX. + (TOOLS_FLAGS_TO_PASS_RE): Likewise. + 2018-10-31 Joseph Myers <joseph@codesourcery.com> PR bootstrap/82856 diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 8a98a2d..b0860ea 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -69,13 +69,16 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \ -iquote $(fsrcdir) -I$(ftop_srcdir)/include 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 -# Due to Windows path translations (See PR ada/81878) we need to add -# -B../../ to the compiler paths as a workaround for that $(CXX) contains -# Unix style paths that won't be translated by the runtime. TOOLS_FLAGS_TO_PASS_NATIVE= \ "CC=../../xgcc -B../../" \ - "CXX=$(CXX) -B../../" \ + "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "ADAFLAGS=$(ADAFLAGS)" \ @@ -93,7 +96,7 @@ TOOLS_FLAGS_TO_PASS_NATIVE= \ # Variables for regnattools TOOLS_FLAGS_TO_PASS_RE= \ "CC=../../xgcc -B../../" \ - "CXX=$(CXX)" \ + "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ "CFLAGS=$(CFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "ADAFLAGS=$(ADAFLAGS)" \ |