if we can't determine the gcc4/5 prefer the new gcc5 ABI

diff --git a/tools/gccabicheck/Makefile b/tools/gccabicheck/Makefile
index 2949e46633ab640a03cd000114bfc276c5135c2f..e891d851310d60931130ecc3688ff52f494f1e34 100644 (file)
--- a/tools/gccabicheck/Makefile
+++ b/tools/gccabicheck/Makefile
@@ -1,7 +1,7 @@
 CFLAGS = -Wall
 LOADLIBES = -ldl
 
-gcc-glibmm-abi-check:
+gcc-glibmm-abi-check: abicheck.c
        $(CC) $(CPPFLAGS) $(CFLAGS) \
                -o gcc-glibmm-abi-check \
                abicheck.c \

diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index 4c660a21e7479bccf360884f888c878722bda8c0..eb8e3d5cbf9668a21512e6cd05a1fe2a70ec9c73 100755 (executable)
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -235,7 +235,7 @@ esac
 ###################
 
 if test -n "$MULTABI_BUNDLE"; then
-       if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
+       if ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --fail --gcc4 > /dev/null"; then
                ABI=-gcc4
        else
                ABI=-gcc5