Bug 1798865 - Use the right llvm-symbolizer on spidermonkey builds. r=decoder

Differential Revision: https://phabricator.services.mozilla.com/D161206

js/src/devtools/automation/variants/msan

@@ -6,7 +6,7 @@
     "env": {
         "JITTEST_EXTRA_ARGS": "--jitflags=interp --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt",
         "JSTESTS_EXTRA_ARGS": "--jitflags=interp --exclude-file={DIR}/cgc-jstests-slow.txt",
-        "MSAN_OPTIONS": "external_symbolizer_path={MOZ_FETCHES_DIR}/clang/bin/llvm-symbolizer:log_path={OUTDIR}/sanitize_log"
+        "MSAN_OPTIONS": "external_symbolizer_path={MOZ_FETCHES_DIR}/llvm-symbolizer/bin/llvm-symbolizer:log_path={OUTDIR}/sanitize_log"
     },
     "ignore-test-failures": "true",
     "max-errors": 7,

taskcluster/scripts/builder/build-sm.sh

@@ -31,10 +31,12 @@ if [ "$upload" = "1" ]; then
 
     # Fuzzing users want the correct version of llvm-symbolizer available in the
     # same directory as the built output.
-    for f in "$MOZ_FETCHES_DIR/clang/bin/llvm-symbolizer"*; do
-        gzip -c "$f" > "$UPLOAD_DIR/llvm-symbolizer.gz" || echo "gzip $f failed" >&2
-        break
-    done
+    if [ -d "$MOZ_FETCHES_DIR/llvm-symbolizer"]; then
+        for f in "$MOZ_FETCHES_DIR/llvm-symbolizer/bin/llvm-symbolizer"*; do
+            gzip -c "$f" > "$UPLOAD_DIR/llvm-symbolizer.gz" || echo "gzip $f failed" >&2
+            break
+        done
+    fi
 else # !upload
 # Provide a note for users on why we don't include artifacts for these builds
 # by default, and how they can get the artifacts if they really need them.