Apple's gcc fixes to bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
13
aclocal.m4
vendored
13
aclocal.m4
vendored
@@ -1464,6 +1464,16 @@ AC_DEFUN(AC_BAKEFILE_DEPS,
|
|||||||
if test "x$GCC" = "xyes"; then
|
if test "x$GCC" = "xyes"; then
|
||||||
DEPSMODE=gcc
|
DEPSMODE=gcc
|
||||||
DEPS_TRACKING=1
|
DEPS_TRACKING=1
|
||||||
|
case "${host}" in
|
||||||
|
powerpc-*-darwin* )
|
||||||
|
dnl -cpp-precomp (the default) conflicts with -MMD option
|
||||||
|
dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html)
|
||||||
|
DEPSFLAG_GCC="-no-cpp-precomp -MMD"
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
DEPSFLAG_GCC="-MMD"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
AC_MSG_RESULT([gcc])
|
AC_MSG_RESULT([gcc])
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT([none])
|
AC_MSG_RESULT([none])
|
||||||
@@ -1480,11 +1490,12 @@ AC_DEFUN(AC_BAKEFILE_DEPS,
|
|||||||
|
|
||||||
DEPSMODE=$DEPSMODE
|
DEPSMODE=$DEPSMODE
|
||||||
DEPSDIR=.deps
|
DEPSDIR=.deps
|
||||||
|
DEPSFLAG_GCC="$DEPSFLAG_GCC"
|
||||||
|
|
||||||
mkdir -p \$DEPSDIR
|
mkdir -p \$DEPSDIR
|
||||||
|
|
||||||
if test \$DEPSMODE = gcc ; then
|
if test \$DEPSMODE = gcc ; then
|
||||||
\${*} -MMD
|
\${*} \${DEPSFLAG_GCC}
|
||||||
status=\${?}
|
status=\${?}
|
||||||
if test \${status} != 0 ; then
|
if test \${status} != 0 ; then
|
||||||
exit \${status}
|
exit \${status}
|
||||||
|
11
configure
vendored
11
configure
vendored
@@ -33910,6 +33910,14 @@ echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6
|
|||||||
if test "x$GCC" = "xyes"; then
|
if test "x$GCC" = "xyes"; then
|
||||||
DEPSMODE=gcc
|
DEPSMODE=gcc
|
||||||
DEPS_TRACKING=1
|
DEPS_TRACKING=1
|
||||||
|
case "${host}" in
|
||||||
|
powerpc-*-darwin* )
|
||||||
|
DEPSFLAG_GCC="-no-cpp-precomp -MMD"
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
DEPSFLAG_GCC="-MMD"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
echo "$as_me:$LINENO: result: gcc" >&5
|
echo "$as_me:$LINENO: result: gcc" >&5
|
||||||
echo "${ECHO_T}gcc" >&6
|
echo "${ECHO_T}gcc" >&6
|
||||||
else
|
else
|
||||||
@@ -33928,11 +33936,12 @@ echo "${ECHO_T}none" >&6
|
|||||||
|
|
||||||
DEPSMODE=$DEPSMODE
|
DEPSMODE=$DEPSMODE
|
||||||
DEPSDIR=.deps
|
DEPSDIR=.deps
|
||||||
|
DEPSFLAG_GCC="$DEPSFLAG_GCC"
|
||||||
|
|
||||||
mkdir -p \$DEPSDIR
|
mkdir -p \$DEPSDIR
|
||||||
|
|
||||||
if test \$DEPSMODE = gcc ; then
|
if test \$DEPSMODE = gcc ; then
|
||||||
\${*} -MMD
|
\${*} \${DEPSFLAG_GCC}
|
||||||
status=\${?}
|
status=\${?}
|
||||||
if test \${status} != 0 ; then
|
if test \${status} != 0 ; then
|
||||||
exit \${status}
|
exit \${status}
|
||||||
|
Reference in New Issue
Block a user