Keep build files in sync (Port
bug 1431251: Remove PKG_CONFIG_LIBDIR from mozconfigs). rs=bustage-fix DONTBUILD
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -20,13 +20,8 @@ then
# package.
mk_add_options "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH"
else
CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
fi
. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-if [ -f /etc/redhat-release ]; then
-# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
-export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
-fi
--- a/build/unix/mozconfig.linux32
+++ b/build/unix/mozconfig.linux32
@@ -1,14 +1,10 @@
. "$topsrcdir/build/unix/mozconfig.linux"
-if [ -f /etc/redhat-release ]; then
-export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
-fi
-
export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1
CFLAGS="$CFLAGS -msse -msse2 -mfpmath=sse"
CXXFLAGS="$CXXFLAGS -msse -msse2 -mfpmath=sse"
if test `uname -m` = "x86_64"; then
CC="$CC -m32 -march=pentium-m"
CXX="$CXX -m32 -march=pentium-m"