Another attempt to add -z execstack to MIPS scudo

llvm · Jan 24, 2025 · ccad783 · ccad783
1 parent e203bf8
commit ccad783
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh b/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
@@ -190,12 +190,12 @@ function configure_scudo_compiler_rt {
   fi
 
   local linker_flags=
-  [[ "${arch}" =~ "mips*" ]] && linker_flags="-latomic -Wl,-z,notext -Wno-unused-command-line-argument"
-
-  local c_flags=
-  [[ "${arch}" =~ "mips*" ]] && c_flags="-Wl,-z,execstack"
-  c_flags="-fPIC ${c_flags}"
-
+  local c_flags="-fPIC"
+  if [[ "${arch}" =~ "mips*" ]]
+  then
+    linker_flags="-latomic -Wl,-z,notext -Wno-unused-command-line-argument"
+    c_flags+=" -Wl,-z,execstack"
+  fi
   local cxx_flags="${c_flags}"
 
   local out_dir=llvm_build2_${name}