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

Only patch bk-deps in configure if dependency tracking is used.

Browse Source 
Otherwise we get (harmless) errors when trying to patch a non-existent file.

See #15454.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-08-29 11:15:53 +00:00
parent 8059d88d80
commit 873194f845
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -41275,11 +41275,11 @@ $as_echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=1
fi fi
if test "$wxUSE_MAC" = 1 ; then if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then
if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
if test "x$disable_macosx_deps" = "xyes"; then if test "x$disable_macosx_deps" = "xyes"; then
sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
mv temp bk-deps mv temp bk-deps
chmod +x bk-deps chmod +x bk-deps
fi fi
fi fi

4
configure.in
View File

@@ -8199,11 +8199,11 @@ dnl when we've configured a Universal binary build.
dnl The next version of Bakefile will have the correct fix for this dnl The next version of Bakefile will have the correct fix for this
dnl at which time, this hack can be removed. dnl at which time, this hack can be removed.
if test "$wxUSE_MAC" = 1 ; then if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then
if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
if test "x$disable_macosx_deps" = "xyes"; then if test "x$disable_macosx_deps" = "xyes"; then
sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
mv temp bk-deps mv temp bk-deps
chmod +x bk-deps chmod +x bk-deps
fi fi
fi fi