AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only disable generation of dependencies if more than one architecture is being built.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2012-06-30 20:59:51 +00:00
parent ba8540022f
commit e269b28e8e
2 changed files with 498 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

914
configure vendored
View File

File diff suppressed because it is too large Load Diff

13
configure.in
View File

@ -1182,6 +1182,11 @@ else
fi 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
if echo $OSX_ARCH_OPTS | grep -q ","; then
disable_macosx_deps=yes
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'`
CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
@ -8215,9 +8220,11 @@ dnl at which time, this hack can be removed.
if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_MAC" = 1 ; then
if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp if test "x$disable_macosx_deps" = "xyes"; then
mv temp bk-deps sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
chmod +x bk-deps mv temp bk-deps
chmod +x bk-deps
fi
fi fi
fi fi