Bug 1721962 - Don't assume XCFLAGS are always in CPPFLAGS on *bsd. r=firefox-build-system-reviewers,jgilbert,andi

Differential Revision: https://phabricator.services.mozilla.com/D121307

gfx/angle/moz.build.common

@@ -7,6 +7,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
         '-Wno-range-loop-construct',
     ]
 
+CXXFLAGS += CONFIG['XCFLAGS']
 
 if CONFIG['INTEL_ARCHITECTURE']:
     CXXFLAGS += CONFIG['SSE2_FLAGS']

js/src/old-configure.in

@@ -757,12 +757,6 @@ esac
 dnl Checks for header files.
 dnl ========================================================
 AC_HEADER_DIRENT
-case "$target_os" in
-freebsd*)
-# for stuff like -lXshm
-    CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
-    ;;
-esac
 
 dnl Checks for libraries.
 dnl ========================================================

old-configure.in

@@ -900,12 +900,6 @@ fi
 dnl Checks for header files.
 dnl ========================================================
 AC_HEADER_DIRENT
-case "$target_os" in
-bitrig*|dragonfly*|freebsd*|openbsd*)
-# for stuff like -lXshm
-    CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
-    ;;
-esac
 
 dnl Check for sin_len and sin6_len - used by SCTP; only appears in Mac/*BSD generally
 AC_CACHE_CHECK(for sockaddr_in.sin_len,

widget/gtk/mozgtk/moz.build

@@ -10,6 +10,8 @@ SOURCES += [
     "mozgtk.c",
 ]
 
+CFLAGS += CONFIG["XCFLAGS"]
+
 # If LDFLAGS contains -Wl,--as-needed or if it's the default for the toolchain,
 # we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the
 # linker will drop those dependencies because no symbols are used from them.

widget/x11/moz.build

@@ -13,4 +13,4 @@ SOURCES += [
 
 FINAL_LIBRARY = "xul"
 
-CXXFLAGS += CONFIG["TK_CFLAGS"]
+CFLAGS += CONFIG["XCFLAGS"]