Add the OSX universal binary related options
to CFLAGS instead of BASECFLAGS.
This fixes issue 8366 and is needed due to
changes introduced in the fix for issue 1628484.
diff --git a/configure.in b/configure.in
index 68e6d5a..a7a0814 100644
--- a/configure.in
+++ b/configure.in
@@ -1052,11 +1052,12 @@
fi
- BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
- tgt=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
- if test "${UNIVERSALSDK}" != "/" -a "${tgt}" '>' '10.4' ; then
- CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
- CPPFLAGS="-isysroot ${UNIVERSALSDK}"
+ CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}"
+ if test "${UNIVERSALSDK}" != "/"
+ then
+ CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+ LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+ CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
fi
fi