Keep build files in sync (Port bug 1431251: Remove PKG_CONFIG_LIBDIR from mozconfigs). rs=bustage-fix DONTBUILD
☠☠ backed out by 262a2523f4d3 ☠ ☠
authorJorg K <jorgk@jorgk.com>
Tue, 30 Jan 2018 11:13:49 +0100
changeset 30997 fb09e4b27ed4cff576ea837a5829b1e0b47a7d6b
parent 30996 d2d6b52bf480eea7258b5cd26494673f45af3a9e
child 30998 e5f3b66b0d121bc61f23e34bb34312e2bdb2d83e
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersbustage-fix
bugs1431251
Keep build files in sync (Port bug 1431251: Remove PKG_CONFIG_LIBDIR from mozconfigs). rs=bustage-fix DONTBUILD
build/unix/mozconfig.linux
build/unix/mozconfig.linux32
--- 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"