Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just like dependency tracking don't disable precompiled headers if there is only one architecture being built.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-07-11 19:16:10 +00:00
parent 7e3e162f87
commit 9b1e77194e
2 changed files with 533 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

992
configure vendored
View File

File diff suppressed because it is too large Load Diff

15
configure.in
View File

@@ -1168,13 +1168,6 @@ if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
dnl If we did move to libtool -static we still wouldn't need arch flags dnl If we did move to libtool -static we still wouldn't need arch flags
dnl because libtool automatically figures it out based on input. dnl because libtool automatically figures it out based on input.
retest_macosx_linking=yes retest_macosx_linking=yes
dnl HACK: PCH could be made to work by precompiling for each architecture into separate directories
dnl and including all architecture directories with each compiler invocation.
dnl That would require a major rework of Bakefile and at the same time it would be nice to have
dnl Objective-C++ precompiled headers.
AC_MSG_WARN([Disabling precompiled headers due to universal binary build.])
bk_use_pch=no
else else
if test "x$wxUSE_MAC_ARCH" != xno; then if test "x$wxUSE_MAC_ARCH" != xno; then
OSX_ARCH_OPTS=$wxUSE_MAC_ARCH OSX_ARCH_OPTS=$wxUSE_MAC_ARCH
@@ -1184,7 +1177,15 @@ fi
if test "x$OSX_ARCH_OPTS" != "x"; then if test "x$OSX_ARCH_OPTS" != "x"; then
dnl Check if there is more than one architecture dnl Check if there is more than one architecture
if echo $OSX_ARCH_OPTS | grep -q ","; then if echo $OSX_ARCH_OPTS | grep -q ","; then
AC_MSG_WARN([Disabling dependency tracking due to universal binary build.])
disable_macosx_deps=yes disable_macosx_deps=yes
dnl HACK: PCH could be made to work by precompiling for each architecture into separate directories
dnl and including all architecture directories with each compiler invocation.
dnl That would require a major rework of Bakefile and at the same time it would be nice to have
dnl Objective-C++ precompiled headers.
AC_MSG_WARN([Disabling precompiled headers due to universal binary build.])
bk_use_pch=no
fi fi
OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'` OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`