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

Commit

Permalink
try to not use the new dtags also for shared objects
Browse files Browse the repository at this point in the history
Belonging to [master]:
  - #2490
  • Loading branch information
adrpo authored and OpenModelica-Hudson committed Jun 3, 2018
1 parent e8a3024 commit 2166555
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions configure.ac
Expand Up @@ -207,7 +207,8 @@ fi
# - RUNPATH instead of RPATH, disable that via -Wl,--disable-new-dtags
# - sqrt from libcolamd is not found in -lm if -Wl,--no-as-needed is not specified
if $CC --version | grep -q gcc && $CC -dumpversion | grep -q "^7"; then
TRY_FLAGS="$TRY_FLAGS -Wl,--disable-new-dtags -Wl,--no-as-needed"
TRY_FLAGS="$TRY_FLAGS -Wl,--no-as-needed"
RPATH_EXTRA="-Wl,--disable-new-dtags"
fi

for flag in $TRY_FLAGS; do
Expand Down Expand Up @@ -735,8 +736,8 @@ else
LDFLAGS="$LDFLAGS -Wl,-rpath-link,$OMBUILDDIR/lib/$host_short/omc"
RT_LDFLAGS_SHARED="-Wl,-rpath-link,$OMBUILDDIR/lib/$host_short/omc"
OMCRUNTIME_SHARED_LDFLAGS="$RT_LDFLAGS $LIBLPSOLVE55 -lzmq $LIBUUID"
RPATH="-Wl,-z,origin -Wl,-rpath,'\$\$ORIGIN/../lib/$host_short/omc' -Wl,-rpath,'\$\$ORIGIN'"
RPATH_QMAKE="-Wl,-z,origin -Wl,-rpath,\\'\\\$\$ORIGIN/../lib/$host_short/omc\\' -Wl,-rpath,\\'\\\$\$ORIGIN\\'"
RPATH="$RPATH_EXTRA -Wl,-z,origin -Wl,-rpath,'\$\$ORIGIN/../lib/$host_short/omc' -Wl,-rpath,'\$\$ORIGIN'"
RPATH_QMAKE="$RPATH_EXTRA -Wl,-z,origin -Wl,-rpath,\\'\\\$\$ORIGIN/../lib/$host_short/omc\\' -Wl,-rpath,\\'\\\$\$ORIGIN\\'"
OS_TARGET="linux"
AR_SH="$AR -ru"
BOOTSTRAP_STATIC=""
Expand Down

0 comments on commit 2166555

Please sign in to comment.