Merge pull request #1281 from ziyao233/outgoing/fix-static-flag

rui314 · Jun 16, 2024 · b83b195 · b83b195
2 parents cff858b + d2774b0
commit b83b195
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/test/elf/common.inc b/test/elf/common.inc
@@ -69,6 +69,10 @@ test_cflags() {
   echo 'int main() {}' | $CC "$@" -o /dev/null -xc - >& /dev/null
 }
 
+test_cxxflags() {
+  echo 'int main() {}' | $CXX "$@" -o /dev/null -xc++ - >& /dev/null
+}
+
 is_musl() {
   ldd --version 2>&1 | grep -q musl
 }

diff --git a/test/elf/exception.sh b/test/elf/exception.sh
@@ -5,7 +5,7 @@
 [ $MACHINE = sh4 ] && skip
 
 static=
-test_cflags -static && static=-static
+test_cxxflags -static && static=-static
 
 # I don't know why, but we need -pthread on m68k
 static="$static -pthread"

diff --git a/test/elf/x86_64_exception-mcmodel-large.sh b/test/elf/x86_64_exception-mcmodel-large.sh
@@ -15,7 +15,7 @@ EOF
 $CXX -B. -o $t/exe $t/a.o -mcmodel=large
 $QEMU $t/exe
 
-if echo 'int main() {}' | $CC -o /dev/null -xc - -static >& /dev/null; then
+if test_cxxflags -static; then
   $CXX -B. -o $t/exe $t/a.o -static -mcmodel=large
   $QEMU $t/exe
 fi