From 21665552512f766f4ffbd827909ff10d759d1158 Mon Sep 17 00:00:00 2001
From: Adrian Pop <adrian.pop@liu.se>
Date: Mon, 4 Jun 2018 01:36:33 +0200
Subject: [PATCH] try to not use the new dtags also for shared objects

Belonging to [master]:
  - OpenModelica/OMCompiler#2490
---
 configure.ac | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index c51d869b164..1bc8e57e88b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -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=""