From d3de3f21fd3322b5b595946c35ef65dd441de7cd Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 9 Dec 2010 22:17:25 +0000 Subject: [PATCH] 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 --- libgo/Makefile.am | 2 +- libgo/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 506486285d0..46165dfb48f 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 3e527376bf5..ec0f3e2920d 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 -- 2.30.2