aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2010-12-09 22:17:25 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2010-12-09 22:17:25 +0000
commitd3de3f21fd3322b5b595946c35ef65dd441de7cd (patch)
treefef65d479deba92b99936a98ab8f7e8f6cd07eaa
parent8d47c1319ae76daf6609719b716dd4f2856d9d26 (diff)
downloadgcc-d3de3f21fd3322b5b595946c35ef65dd441de7cd.zip
gcc-d3de3f21fd3322b5b595946c35ef65dd441de7cd.tar.gz
gcc-d3de3f21fd3322b5b595946c35ef65dd441de7cd.tar.bz2
re PR bootstrap/46812 (Linux libgo compilation fails when a "libnet" is already installed)
PR bootstrap/46812 Add explicit -I . when building libgo. From-SVN: r167668
-rw-r--r--libgo/Makefile.am2
-rw-r--r--libgo/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 5064862..46165df 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1291,7 +1291,7 @@ BUILDARCHIVE = \
test -d $(@D) || $(MKDIR_P) $(@D); \
rm -f $@; \
files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
- if $(LTGOCOMPILE) -c -fgo-prefix="libgo_$(@D)" -o $@.$(OBJEXT) $$files; then \
+ if $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_$(@D)" -o $@.$(OBJEXT) $$files; then \
$(AR) rc $@ $@.$(OBJEXT); \
else exit 1; fi
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 3e52737..ec0f3e2 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1586,7 +1586,7 @@ BUILDARCHIVE = \
test -d $(@D) || $(MKDIR_P) $(@D); \
rm -f $@; \
files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \
- if $(LTGOCOMPILE) -c -fgo-prefix="libgo_$(@D)" -o $@.$(OBJEXT) $$files; then \
+ if $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_$(@D)" -o $@.$(OBJEXT) $$files; then \
$(AR) rc $@ $@.$(OBJEXT); \
else exit 1; fi