From 9fbb94f2270d423ed8715578e7fa76daa8e85ab9 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sun, 23 Feb 2014 16:30:11 +0000
Subject: [PATCH] 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
---
gcc/ada/ChangeLog | 4 ++++
gcc/ada/gcc-interface/Make-lang.in | 4 ++--
gnattools/ChangeLog | 4 ++++
gnattools/Makefile.in | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9ab0bb23b47a..003533801eb7 100644
--- 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 8c87b2bba26d..4f0ca79b097a 100644
--- 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 a7bd840efb19..69985f4d445e 100644
--- 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 4ec7afd5dd87..423cc6e950cc 100644
--- 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)" \
--
GitLab