From 388a8fc9be9d7320b7fbb3fbbc9ba7f99cd9b295 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 2 Aug 2016 15:50:16 +0200
Subject: if we can't determine the gcc4/5 prefer the new gcc5 ABI

---
 tools/gccabicheck/Makefile          | 2 +-
 tools/linux_packaging/stage2.run.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/gccabicheck/Makefile b/tools/gccabicheck/Makefile
index 2949e46633..e891d85131 100644
--- 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 4c660a21e7..eb8e3d5cbf 100755
--- 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
-- 
cgit v1.2.3