Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- Propagate -lintl to rml-generated code


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18489 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Dec 16, 2013
1 parent b3c3ab2 commit 7f73ad6
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions configure.in
Expand Up @@ -518,7 +518,7 @@ AC_TRY_LINK([
#include <libintl.h>
], [
gettext("");
], [AC_MSG_RESULT([in intl]);RT_LDFLAGS="$RT_LDFLAGS $LIBS"],
], [AC_MSG_RESULT([in intl]);RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE $LIBS"],
[AC_MSG_ERROR([no])])
])

Expand Down Expand Up @@ -788,8 +788,8 @@ if test "Darwin" = `uname`; then
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lf2c -lexpat -liconv -lgc -lpthread -lm -ldl -lstdc++"
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -liconv -lgc -lpthread -lm -ldl -lstdc++"
# All libraries are dynamically linked; we don't need anything else
RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm"
RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC $LD_LAPACK -lm -lgc"
RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm"
RT_LDFLAGS_GENERATED_CODE_SIM="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lSimulationRuntimeC $LD_LAPACK -lm -lgc"
LINK="cp -fr"
RPATH="-Wl,-rpath,'@loader_path/../lib/omc'"
MSL_EXTRA_ARGS="--disable-hdf5 --enable-static-zlib --enable-static --disable-shared"
Expand All @@ -810,8 +810,8 @@ elif test "$host" = "i586-pc-mingw32msvc"; then
FMILIB_SHARED=OFF
RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lstdc++ -lf2c -lgc -lexpat -lm"
RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc -lexpat -lpthread -lm"
RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC $RT_LDFLAGS_SIM"
RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
RT_LDFLAGS_GENERATED_CODE_SIM="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lSimulationRuntimeC $RT_LDFLAGS_SIM"
LINK="cp -frl"
RPATH="-Wl,-rpath,'\$\$ORIGIN/../lib/omc'"
OS_TARGET="windows"
Expand All @@ -834,8 +834,8 @@ else
RT_LDFLAGS_SIM="-Wl,-rpath,'\$\$ORIGIN' $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $LIBRT -linteractive -llis -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
RT_LDFLAGS="$RT_LDFLAGS $LD_LAPACK -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
# All libraries are dynamically linked; we don't need anything else
RT_LDFLAGS_GENERATED_CODE="-lOpenModelicaRuntimeC $LD_LAPACK -lm -rdynamic"
RT_LDFLAGS_GENERATED_CODE_SIM="-lSimulationRuntimeC $LD_LAPACK -lm -lgc -lpthread -rdynamic"
RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE -lOpenModelicaRuntimeC $LD_LAPACK -lm -rdynamic"
RT_LDFLAGS_GENERATED_CODE_SIM="$RT_LDFLAGS_GENERATED_CODE -lSimulationRuntimeC $LD_LAPACK -lm -lgc -lpthread -rdynamic"
LINK="cp -frl"
RPATH="-Wl,-rpath,'\$\$ORIGIN/../lib/omc'"
OS_TARGET="linux"
Expand Down

0 comments on commit 7f73ad6

Please sign in to comment.