From 2aa4a82499d4becd2284cdb482213d541b8804dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 16:29:10 +0200 Subject: Adding upstream version 86.0.1. Signed-off-by: Daniel Baumann --- build/unix/mozconfig.stdcxx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 build/unix/mozconfig.stdcxx (limited to 'build/unix/mozconfig.stdcxx') diff --git a/build/unix/mozconfig.stdcxx b/build/unix/mozconfig.stdcxx new file mode 100644 index 0000000000..b263668aea --- /dev/null +++ b/build/unix/mozconfig.stdcxx @@ -0,0 +1,17 @@ +# 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" ]; 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" ]; 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" -- cgit v1.2.3