Changeset 18489

Timestamp:

2013-12-16T10:24:26+01:00 (10 years ago)

Author:

sjoelund.se

Message:

#2513

• Propagate -lintl to rml-generated code

File:

• trunk/configure.in (modified) (4 diffs)

trunk/configure.in

@@ -519 +519 @@
   ], [
       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])])
 ])
@@ -789 +789 @@
   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'"
@@ -811 +811 @@
   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'"
@@ -835 +835 @@
   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'"