Bug 505739 - "Remove XCFLAGS from default compile line to fix mingw cross-compile issues" (remove X_CFLAGS from CPPFLAGS) [r=bsmedberg]
authorJacek Caban <jacek@codeweavers.com>
Fri, 04 Sep 2009 21:54:02 -0500
changeset 32260 a794f12d6642fbc6742439c0109fba9d7c1cd619
parent 32259 4524f7de84633bd471e19cf0fec3e4c6ca6419f3
child 32261 e3b289b0a31c7d238b90a9c7ca1131ca22612dfc
push id8952
push userreed@reedloden.com
push dateSat, 05 Sep 2009 02:54:26 +0000
treeherdermozilla-central@e3b289b0a31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs505739
milestone1.9.3a1pre
Bug 505739 - "Remove XCFLAGS from default compile line to fix mingw cross-compile issues" (remove X_CFLAGS from CPPFLAGS) [r=bsmedberg]
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1014,21 +1014,16 @@ if test "$GMAKE" = ":"; then
    AC_MSG_ERROR([GNU make not found])
 fi
 AC_SUBST(GMAKE)
 
 if test "$COMPILE_ENVIRONMENT"; then
 
 AC_PATH_XTRA
 
-dnl Check in X11 include directory too.
-if test "$no_x" != "yes"; then
-    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-fi
-
 XCFLAGS="$X_CFLAGS"
 
 fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl set the defaults first
 dnl ========================================================
 AS_BIN=$AS
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -834,21 +834,16 @@ cygwin*|mingw*|mks*|msvc*)
     MOZ_PATH_PROGS(MAKE, $MAKE gmake make, :)
     ;;
 esac
 
 if test "$COMPILE_ENVIRONMENT"; then
 
 AC_PATH_XTRA
 
-dnl Check in X11 include directory too.
-if test "$no_x" != "yes"; then
-    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-fi
-
 XCFLAGS="$X_CFLAGS"
 
 fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl set the defaults first
 dnl ========================================================
 AS_BIN=$AS