From 0ecdd2aae98b931eb50dff3c8013a1b7adcfaa95 Mon Sep 17 00:00:00 2001
From: "Loren J. Rittle" <ljrittle@acm.org>
Date: Thu, 1 Oct 2009 23:14:35 +0000
Subject: [PATCH] Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Use $$s rather than
$(srcdir).
2009-10-01 Loren J. Rittle <ljrittle@acm.org>
Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Use $$s rather than
$(srcdir).
* Makefile.in: Rebuilt.
Co-Authored-By: Paolo Bonzini <bonzini@gnu.org>
From-SVN: r152387
---
ChangeLog | 7 +++++++
Makefile.in | 2 +-
Makefile.tpl | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b7133e5c8add..3fc53057096e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-01 Loren J. Rittle <ljrittle@acm.org>
+ Paolo Bonzini <bonzini@gnu.org>
+
+ * Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Use $$s rather than
+ $(srcdir).
+ * Makefile.in: Rebuilt.
+
2009-09-26 Gary Funck <gary@intrepid.com>
* MAINTAINERS (Write After Approval): Add myself.
diff --git a/Makefile.in b/Makefile.in
index 354193c4db29..4f8691113e37 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -235,7 +235,7 @@ POSTSTAGE1_HOST_EXPORTS = \
-B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
-I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
-I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
- -I$(srcdir)/libstdc++-v3/libsupc++ \
+ -I$$s/libstdc++-v3/libsupc++ \
-L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs"; export CXX; \
CXX_FOR_BUILD="$$CXX"; export CXX_FOR_BUILD; \
GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
diff --git a/Makefile.tpl b/Makefile.tpl
index 28ac9879b1b3..476cd5d291b6 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -238,7 +238,7 @@ POSTSTAGE1_HOST_EXPORTS = \
-B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
-I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
-I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
- -I$(srcdir)/libstdc++-v3/libsupc++ \
+ -I$$s/libstdc++-v3/libsupc++ \
-L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs"; export CXX; \
CXX_FOR_BUILD="$$CXX"; export CXX_FOR_BUILD; \
GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
--
GitLab