diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index ed351c032ed..01d8515d1de 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -5485b3faed476f6d051833d1790b5f77be9d1efc +fecb92bda0aa6d70c89d14635ff568df77d2bb5f The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/Makefile.am b/libgo/Makefile.am index f0ecf92ca7d..7be49973f95 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1001,7 +1001,7 @@ CHECK = \ export MAKE; \ NM="$(NM)"; \ export NM; \ - libgccdir=`${GOC} -print-libgcc-file-name | sed -e 's|/[^/]*$$||'`; \ + libgccdir=`${GOC} ${GOCFLAGS} -print-libgcc-file-name | sed -e 's|/[^/]*$$||'`; \ LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \ LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ export LD_LIBRARY_PATH; \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 794c125516a..ac9f5291a10 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1135,7 +1135,7 @@ CHECK = \ export MAKE; \ NM="$(NM)"; \ export NM; \ - libgccdir=`${GOC} -print-libgcc-file-name | sed -e 's|/[^/]*$$||'`; \ + libgccdir=`${GOC} ${GOCFLAGS} -print-libgcc-file-name | sed -e 's|/[^/]*$$||'`; \ LD_LIBRARY_PATH="`${PWD_COMMAND}`/.libs:$${libgccdir}:${LD_LIBRARY_PATH}"; \ LD_LIBRARY_PATH=`echo $${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ export LD_LIBRARY_PATH; \ |