Apple's gcc fixes to bakefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/aclocal.m4 b/aclocal.m4
index d6855d245b6934270e16b1a492df447a342d26d9..b92b74aa73f8efc09499514e59fbf9b114a5dc7d 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1464,6 +1464,16 @@ AC_DEFUN(AC_BAKEFILE_DEPS,
     if test "x$GCC" = "xyes"; then
         DEPSMODE=gcc
         DEPS_TRACKING=1
     if test "x$GCC" = "xyes"; then
         DEPSMODE=gcc
         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])
     else
         AC_MSG_RESULT([none])
         AC_MSG_RESULT([gcc])
     else
         AC_MSG_RESULT([none])


@@ -1480,11 +1490,12 @@ AC_DEFUN(AC_BAKEFILE_DEPS,
 
 DEPSMODE=$DEPSMODE
 DEPSDIR=.deps
 
 DEPSMODE=$DEPSMODE
 DEPSDIR=.deps

+DEPSFLAG_GCC="$DEPSFLAG_GCC"

 
 mkdir -p \$DEPSDIR
 
 if test \$DEPSMODE = gcc ; then
 
 mkdir -p \$DEPSDIR
 
 if test \$DEPSMODE = gcc ; then

-    \${*} -MMD
+    \${*} \${DEPSFLAG_GCC}

     status=\${?}
     if test \${status} != 0 ; then
         exit \${status}
     status=\${?}
     if test \${status} != 0 ; then
         exit \${status}

diff --git a/configure b/configure
index a9f05fee7337248310893901826df0ff940ce685..e2223df8e968be7a3ceccbfca232cea1d45364d7 100755 (executable)
--- a/configure
+++ b/configure
@@ -33910,6 +33910,14 @@ echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6
     if test "x$GCC" = "xyes"; then
         DEPSMODE=gcc
         DEPS_TRACKING=1
     if test "x$GCC" = "xyes"; then
         DEPSMODE=gcc
         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 "${ECHO_T}gcc" >&6
     else
         echo "$as_me:$LINENO: result: gcc" >&5
 echo "${ECHO_T}gcc" >&6
     else


@@ -33928,11 +33936,12 @@ echo "${ECHO_T}none" >&6
 
 DEPSMODE=$DEPSMODE
 DEPSDIR=.deps
 
 DEPSMODE=$DEPSMODE
 DEPSDIR=.deps

+DEPSFLAG_GCC="$DEPSFLAG_GCC"

 
 mkdir -p \$DEPSDIR
 
 if test \$DEPSMODE = gcc ; then
 
 mkdir -p \$DEPSDIR
 
 if test \$DEPSMODE = gcc ; then

-    \${*} -MMD
+    \${*} \${DEPSFLAG_GCC}

     status=\${?}
     if test \${status} != 0 ; then
         exit \${status}
     status=\${?}
     if test \${status} != 0 ; then
         exit \${status}