Makefile.in (TOOLS_FLAGS_TO_PASS_CROSS): Robustify.

gnattools/
	* Makefile.in (TOOLS_FLAGS_TO_PASS_CROSS): Robustify.
gcc/ada/
	* gcc-interface/Make-lang.in (ADA_TOOLS_FLAGS_TO_PASS): Likewise.

From-SVN: r208053

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9ab0bb23b47af16e3107b90ece5eb44c09862478..003533801eb7172dbef82318e50e5e7551050356 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/Make-lang.in (ADA_TOOLS_FLAGS_TO_PASS): Robustify.
+
 2014-02-23  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/utils2.c (build_simple_component_ref): Fix formatting.

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 8c87b2bba26dd5c2c59a7d2531afa7dadeadbdd3..4f0ca79b097a1f73d52749d697ff1f99df2dc86e 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -162,7 +162,7 @@ ifeq ($(build), $(host))
         CC="$(CC)" \
         CXX="$(CXX)" \
         $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \
-        ADA_INCLUDES="-I$(RTS_DIR)../adainclude -I$(RTS_DIR)" \
+        ADA_INCLUDES="-I$(RTS_DIR)/../adainclude -I$(RTS_DIR)" \
         GNATMAKE="gnatmake" \
         GNATBIND="gnatbind" \
         GNATLINK="gnatlink" \
@@ -200,7 +200,7 @@ else
         CC="$(CC)" \
         CXX="$(CXX)" \
         $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS)  \
-        ADA_INCLUDES="-I$(RTS_DIR)../adainclude -I$(RTS_DIR)" \
+        ADA_INCLUDES="-I$(RTS_DIR)/../adainclude -I$(RTS_DIR)" \
         GNATMAKE="$(GNATMAKE_FOR_HOST)"      \
         GNATBIND="$(GNATBIND_FOR_HOST)"      \
         GNATLINK="$(GNATLINK_FOR_HOST)"      \

diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index a7bd840efb19a7869b83f39a137a6a6cbe512ee8..69985f4d445e3c0a117045f8ec8cf04824cb65ca 100644 (file)
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * Makefile.in (TOOLS_FLAGS_TO_PASS_CROSS): Robustify.
+
 2014-01-27  Eric Botcazou  <ebotcazou@adacore.com>
 
        * configure.ac (*-*-lynxos*): Delete.

diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index 4ec7afd5dd87a66dcf10ff55aeb42dd762025727..423cc6e950cc36c22a505107d55f8766c9481769 100644 (file)
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -132,7 +132,7 @@ TOOLS_FLAGS_TO_PASS_CROSS= \
        "ADAFLAGS=$(ADAFLAGS)"  \
        "ADA_CFLAGS=$(ADA_CFLAGS)" \
        "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
-       "ADA_INCLUDES=-I$(RTS_DIR)../adainclude -I$(RTS_DIR) $(ADA_INCLUDES_FOR_SUBDIR)" \
+       "ADA_INCLUDES=-I$(RTS_DIR)/../adainclude -I$(RTS_DIR) $(ADA_INCLUDES_FOR_SUBDIR)" \
        "exeext=$(exeext)" \
        "fsrcdir=$(fsrcdir)" \
        "srcdir=$(fsrcdir)" \