libgo: fix makefile buglet

    Fix a small bug in the libgo Makefile recipe that constructs the
    directory from which to pick up libgcc_s.so ; the gccgo invocation
    with -print-libgcc-file-name was missing the flags, which meant that
    for -m32 builds we'd see the 64-bit libgcc dir.

    Reviewed-on: https://go-review.googlesource.com/78836

From-SVN: r254984

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ed351c032ed3bd39fd9217f66225a6fe07f390b4..01d8515d1de59f7ff5b7ed8bd0a67b9fabc60d69 100644 (file)
--- 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 f0ecf92ca7d225b654ca54901328f9e22b01311e..7be49973f95c93d9a367b567078bfa654d82d9fd 100644 (file)
--- 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 794c125516a57517ccaa394c5b5c8f0d74b6f5bb..ac9f5291a10d15f7b98bf823ad1c0f41352d4463 100644 (file)
--- 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; \