Skip to content

Commit 20bfad5

Browse files
committed
Fix linking test
1 parent ac33154 commit 20bfad5

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

acsm_compiler_flags.m4

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,20 +587,23 @@ AC_DEFUN([ACSM_SET_CXX_FLAGS],
587587
[clang], [
588588
dnl On Darwin with clang + gfortran, we get very many warnings for compact unwinding issues
589589
dnl We deliberately keep relying on the less performant dwarf unwinding until the over-production of warnings is solved.
590-
OLD_ACSM_LDFLAGS="$ACSM_LDFLAGS"
591-
ACSM_LDFLAGS+=" -Wl,-femit-dwarf-unwind=no_compact_unwind"
590+
old_LDFLAGS="$LDFLAGS"
591+
LDFLAGS+=" -Wl,-femit-dwarf-unwind=no_compact_unwind"
592592
AC_LINK_IFELSE([AC_LANG_SOURCE([[
593+
#include <iostream>
593594
void main(int argc, char **argv)
594595
{
595596
std::cout << "Hello World!" << std::endl;
596597
}
597598
]])],
598599
[
599600
AC_MSG_RESULT(<<<Disabling compact unwinding, retaining dwarf unwinding for gfortran compatibility>>>)
601+
ACSM_LDFLAGS+=" -Wl,-femit-dwarf-unwind=no_compact_unwind"
600602
],[
601-
dnl Failed to link with new flags, remove them
602-
ACSM_LDFLAGS="$OLD_ACSM_LDFLAGS"
603+
dnl Failed to link with new flags, do not add them
603604
])
605+
dnl Reset to old flags in case for any potential other test
606+
LDFLAGS="$old_LDFLAGS"
604607
605608
606609
ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O2 -felide-constructors -Qunused-arguments -Wunused-parameter -Wunused"

0 commit comments

Comments
 (0)