From 60ed988fd6c67b489d7cc186ecaa9db4e5c25b8c Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 20 Apr 2015 18:14:19 -0400 Subject: [PATCH] fix regression in configure script with new visibility option commit de2b67f8d41e08caa56bf6540277f6561edb647f introduced a regression by adding a -include option to CFLAGS_AUTO which did not work without additional -I options. this broke subsequent trycppif tests and caused x86_64 to be misdetected as x32, among other issues. simply using the full relative pathname to vis.h rather than -I is the cleanest way to fix the problem. --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0e396941..e35c9b63 100755 --- a/configure +++ b/configure @@ -428,8 +428,8 @@ printf "checking whether global visibility preinclude works... " echo 'int (*fp)(void);' > "$tmpc" echo 'int foo(void) { }' >> "$tmpc" echo 'int bar(void) { fp = foo; return foo(); }' >> "$tmpc" -if $CC $CFLAGS_C99FSE -I./arch/$ARCH -I src/internal -I./include \ - $CPPFLAGS $CFLAGS -DSHARED -fPIC -include vis.h \ +if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS \ + -DSHARED -fPIC -include src/internal/vis.h \ -nostdlib -shared -Wl,-Bsymbolic-functions \ -o /dev/null "$tmpc" >/dev/null 2>&1 ; then visibility=yes @@ -440,7 +440,7 @@ printf "%s\n" "$visibility" fi if test "x$visibility" == xyes ; then -CFLAGS_AUTO="$CFLAGS_AUTO -include vis.h" +CFLAGS_AUTO="$CFLAGS_AUTO -include src/internal/vis.h" CFLAGS_AUTO="${CFLAGS_AUTO# }" fi -- 2.25.1