File tree Expand file tree Collapse file tree 3 files changed +7
-1
lines changed
Expand file tree Collapse file tree 3 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -132,7 +132,7 @@ runtimeCPPclean:
132132fmil:
133133 test -d 3rdParty/FMIL
134134 mkdir -p 3rdParty/FMIL/build
135- (cd 3rdParty/FMIL/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) -g" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D FMILIB_BUILD_SHARED_LIB:Bool=$(FMILIB_SHARED) -D FMILIB_BUILD_TESTS:Bool=OFF -D FMILIB_GENERATE_DOXYGEN_DOC:Bool=OFF -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DFMILIB_INSTALL_PREFIX:String=../install .. -G $(CMAKE_TARGET))
135+ (cd 3rdParty/FMIL/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) -g" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" -D FMILIB_BUILD_SHARED_LIB:Bool=$(FMILIB_SHARED) -D FMILIB_BUILD_TESTS:Bool=OFF -D FMILIB_GENERATE_DOXYGEN_DOC:Bool=OFF -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DFMILIB_INSTALL_PREFIX:String=../install .. -G $(CMAKE_TARGET))
136136 test -f 3rdParty/FMIL/build/$(LIBFMILIB) || $(MAKE) -C 3rdParty/FMIL/build
137137 test -d 3rdParty/FMIL/install || $(MAKE) -C 3rdParty/FMIL/build install
138138 test ! -f 3rdParty/FMIL/build/libfmilib_shared.so || cp -up 3rdParty/FMIL/build/libfmilib_shared.so 3rdParty/FMIL/build/libfmilib.so
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ docdir = @docdir@
1313CMAKE = CC=$(CC ) CXX=$(CXX ) cmake
1414CMAKE_TARGET = "Unix Makefiles"
1515OPENCL = @OPENCL@
16+ AR = @AR@
1617
1718defaultMakefileTarget = Makefile
1819QMAKE =@QMAKE@
Original file line number Diff line number Diff line change @@ -69,9 +69,14 @@ AC_SUBST(LIS_LDFLAGS)
6969AC_SUBST(LAPACK_TARGET)
7070AC_SUBST(CONFIG_WITH_OPENMP)
7171AC_SUBST(OPENBLAS_EXTRA_ARGS)
72+ AC_SUBST(AR)
7273
7374FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
7475
76+ if test -z "$AR"; then
77+ AR=ar
78+ fi
79+
7580if test -z "$MAKE"; then
7681 MAKE=make
7782fi
You can’t perform that action at this time.
0 commit comments