aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnattools/ChangeLog5
-rw-r--r--gnattools/Makefile.in5
2 files changed, 9 insertions, 1 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index 71a49e8..4bd70ee 100644
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index d19147f..8a98a2d 100644
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -70,9 +70,12 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
# 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)" \
+ "CXX=$(CXX) -B../../" \
"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
"LDFLAGS=$(LDFLAGS)" \
"ADAFLAGS=$(ADAFLAGS)" \