ardour/livetrax
13
0
Fork 0
Code

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

Browse Source
This commit is contained in:
Robin Gareus 2016-08-02 15:50:16 +02:00
parent 34290320f6
commit 388a8fc9be
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/gccabicheck/Makefile
View File

@ -1,7 +1,7 @@
CFLAGS = -Wall CFLAGS = -Wall
LOADLIBES = -ldl LOADLIBES = -ldl
gcc-glibmm-abi-check: gcc-glibmm-abi-check: abicheck.c
$(CC) $(CPPFLAGS) $(CFLAGS) \ $(CC) $(CPPFLAGS) $(CFLAGS) \
-o gcc-glibmm-abi-check \ -o gcc-glibmm-abi-check \
abicheck.c \ abicheck.c \

2
tools/linux_packaging/stage2.run.in
View File

@ -235,7 +235,7 @@ esac
################### ###################
if test -n "$MULTABI_BUNDLE"; then 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 ABI=-gcc4
else else
ABI=-gcc5 ABI=-gcc5