Changeset 18492


Ignore:
Timestamp:
2013-12-16T12:42:40+01:00 (10 years ago)
Author:
sjoelund.se
Message:

Fix OSX compilation

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.in

    r18489 r18492  
    786786  LIBFMILIB=libfmilib_shared.dylib
    787787  FMILIB_SHARED=ON
    788   RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lf2c -lexpat -liconv -lgc -lpthread -lm -ldl -lstdc++"
    789   RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -liconv -lgc -lpthread -lm -ldl -lstdc++"
     788  RT_LDFLAGS_SIM="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lf2c -lexpat -liconv -lgc -lpthread -lm -ldl -lstdc++"
     789  RT_LDFLAGS="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS $RT_LDFLAGS $LD_LAPACK -liconv -lgc -lpthread -lm -ldl -lstdc++"
    790790  # All libraries are dynamically linked; we don't need anything else
    791791  RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm"
     
    809809  LIBFMILIB=libfmilib.a
    810810  FMILIB_SHARED=OFF
    811   RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lstdc++ -lf2c -lgc -lexpat -lm"
    812   RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc -lexpat -lpthread -lm"
    813   RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
    814   RT_LDFLAGS_GENERATED_CODE_SIM="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lSimulationRuntimeC $RT_LDFLAGS_SIM"
     811  RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS_GENERATED_CODE $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lstdc++ -lf2c -lgc -lexpat -lm"
     812  RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS_GENERATED_CODE $RT_LDFLAGS $LD_LAPACK -lgc -lexpat -lpthread -lm"
     813  RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
     814  RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC $RT_LDFLAGS_SIM"
    815815  LINK="cp -frl"
    816816  RPATH="-Wl,-rpath,'\$\$ORIGIN/../lib/omc'"
     
    832832  # For static runtime on Linux:
    833833  # -Wl,-whole-archive -lSimulationRuntimeC -Wl,-no-whole-archive
    834   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"
    835   RT_LDFLAGS="$RT_LDFLAGS $LD_LAPACK -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
     834  RT_LDFLAGS_SIM="-Wl,-rpath,'\$\$ORIGIN' $RT_LDFLAGS $RT_LDFLAGS_GENERATED_CODE $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $LIBRT -linteractive -llis -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
     835  RT_LDFLAGS="$RT_LDFLAGS $RT_LDFLAGS_GENERATED_CODE $LD_LAPACK -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
    836836  # All libraries are dynamically linked; we don't need anything else
    837837  RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE -lOpenModelicaRuntimeC $LD_LAPACK -lm -rdynamic"
Note: See TracChangeset for help on using the changeset viewer.