3 files changed, 13 insertions, 2 deletions
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index cc365e999..4afa52bd4 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -89,7 +89,7 @@ export CC=${CC:-clang}
 export CXX=${CXX:-clang++}
 
 # Set linker to use:
-if [ "$CC" = "clang" ]; then
+if [ "$CC" = "clang" -a "$(which lld 2> /dev/null)" = "/usr/bin/lld" ]; then
   # Upstream default:
   LINKER=lld
 else
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 58667bf8c..4ee9abab9 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -119,7 +119,7 @@ export CC=${CC:-clang}
 export CXX=${CXX:-clang++}
 
 # Set linker to use:
-if [ "$CC" = "clang" ]; then
+if [ "$CC" = "clang" -a "$(which lld 2> /dev/null)" = "/usr/bin/lld" ]; then
   # Upstream default:
   LINKER=lld
 else
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild
index 546dc904b..e545a4abb 100755
--- a/source/xap/seamonkey/seamonkey.SlackBuild
+++ b/source/xap/seamonkey/seamonkey.SlackBuild
@@ -93,6 +93,16 @@ fi
 # Set linker to use:
 LINKER=bfd
 
+# Rust SIMD often fails to compile, may limit the processors that Seamonkey
+# can run on, and doesn't seem to provide much (if any) of a performance 
+# improvement, so it's disabled here by default:
+DISABLE_RUST_SIMD=${DISABLE_RUST_SIMD:-YES}
+if [ "$DISABLE_RUST_SIMD" = "YES" ]; then
+  RUST_SIMD="--disable-rust-simd"
+else
+  RUST_SIMD="--enable-rust-simd"
+fi
+
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 TMP=${TMP:-/tmp}
@@ -158,6 +168,7 @@ OPTIONS="\
   --disable-updater \
   --enable-chrome-format=omni \
   --disable-necko-wifi \
+  $RUST_SIMD \
   --enable-extensions=default \
   --enable-js-shell \
   $ELFHACK \