Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit cc5bf4b

Browse files
adrpoOpenModelica-Hudson
authored andcommitted
handle -Wl,--disable-new-dtags via configure
Belonging to [master]: - #2488
1 parent cf3746a commit cc5bf4b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Compiler/boot/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
CC=@CC@
66
CXX=@CXX@
7-
CFLAGS=@CFLAGS@ @CHECK_C_ERRORS@ -Wl,--disable-new-dtags
7+
CFLAGS=@CFLAGS@ @CHECK_C_ERRORS@
88
TOP_DIR=@abs_top_builddir@
99
OMHOME=@OMBUILDDIR@
1010
OMBUILDDIR=@OMBUILDDIR@

configure.ac

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,11 @@ if $CC --version | grep -q gcc && $CC -dumpversion | grep -q "^5"; then
203203
TRY_FLAGS="$TRY_FLAGS -fno-ipa-pure-const"
204204
fi
205205

206+
# GCC 7.x generates RUNPATH instead of RPATH
207+
if $CC --version | grep -q gcc && $CC -dumpversion | grep -q "^7"; then
208+
TRY_FLAGS="$TRY_FLAGS -Wl,--disable-new-dtags"
209+
fi
210+
206211
for flag in $TRY_FLAGS; do
207212
OLD_CFLAGS="$CFLAGS"
208213
CFLAGS="$RUNTIMECFLAGS $flag -Werror"

0 commit comments

Comments
 (0)