Skip to content

Commit 2aaa3d7

Browse files
committed
- Allow configuring ar
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17495 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent f305f80 commit 2aaa3d7

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ runtimeCPPclean:
132132
fmil:
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

Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ docdir = @docdir@
1313
CMAKE = CC=$(CC) CXX=$(CXX) cmake
1414
CMAKE_TARGET = "Unix Makefiles"
1515
OPENCL = @OPENCL@
16+
AR = @AR@
1617

1718
defaultMakefileTarget = Makefile
1819
QMAKE=@QMAKE@

configure.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,14 @@ AC_SUBST(LIS_LDFLAGS)
6969
AC_SUBST(LAPACK_TARGET)
7070
AC_SUBST(CONFIG_WITH_OPENMP)
7171
AC_SUBST(OPENBLAS_EXTRA_ARGS)
72+
AC_SUBST(AR)
7273

7374
FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
7475

76+
if test -z "$AR"; then
77+
AR=ar
78+
fi
79+
7580
if test -z "$MAKE"; then
7681
MAKE=make
7782
fi

0 commit comments

Comments
 (0)