handle -Wl,--disable-new-dtags via configure

Belonging to [master]: - OpenModelica/OMCompiler#2488
OpenModelica · Jun 3, 2018 · cc5bf4b · cc5bf4b
1 parent cf3746a
commit cc5bf4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Compiler/boot/Makefile.in b/Compiler/boot/Makefile.in
@@ -4,7 +4,7 @@
 
 CC=@CC@
 CXX=@CXX@
-CFLAGS=@CFLAGS@ @CHECK_C_ERRORS@ -Wl,--disable-new-dtags
+CFLAGS=@CFLAGS@ @CHECK_C_ERRORS@
 TOP_DIR=@abs_top_builddir@
 OMHOME=@OMBUILDDIR@
 OMBUILDDIR=@OMBUILDDIR@

diff --git a/configure.ac b/configure.ac
@@ -203,6 +203,11 @@ if $CC --version | grep -q gcc && $CC -dumpversion | grep -q "^5"; then
   TRY_FLAGS="$TRY_FLAGS -fno-ipa-pure-const"
 fi
 
+# GCC 7.x generates RUNPATH instead of RPATH
+if $CC --version | grep -q gcc && $CC -dumpversion | grep -q "^7"; then
+  TRY_FLAGS="$TRY_FLAGS -Wl,--disable-new-dtags"
+fi
+
 for flag in $TRY_FLAGS; do
   OLD_CFLAGS="$CFLAGS"
   CFLAGS="$RUNTIMECFLAGS $flag -Werror"