diff --git a/build/unix/mozconfig.stdcxx b/build/unix/mozconfig.stdcxx index c244b39ded15..0146f3af9a89 100644 --- a/build/unix/mozconfig.stdcxx +++ b/build/unix/mozconfig.stdcxx @@ -1,17 +1,2 @@ # Avoid dependency on libstdc++ 4.7 export MOZ_STDCXX_COMPAT=1 - -# Depending whether GCC was built on a RedHat-based or a Debian-based system, -# the directory containing 32-bits libraries can be either (respectively) -# lib or lib32. The directory for 64-bits libraries is always lib64. -if [ -f "$MOZ_FETCHES_DIR/gcc/lib64/libstdc++.so.6" ]; then - # We put both 32-bits and 64-bits library path in LD_LIBRARY_PATH: ld.so - # will prefer the files in the 32-bits path when loading 32-bits executables, - # and the files in the 64-bits path when loading 64-bits executables. - # We also put both possible 32-bits library paths. - LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$MOZ_FETCHES_DIR/gcc/lib64:$MOZ_FETCHES_DIR/gcc/lib32:$MOZ_FETCHES_DIR/gcc/lib -elif [ -f "$MOZ_FETCHES_DIR/clang/lib/libstdc++.so.6" ]; then - LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$MOZ_FETCHES_DIR/clang/lib:$MOZ_FETCHES_DIR/clang/lib32 -fi - -mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"