Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit 47881a3

Browse files
sjoelundOpenModelica-Hudson
authored andcommitted
[OSX] Fix builds when using a single thread
With a single thread, install_name_tool did not execute for the MSL external libraries (except for libModelicaExternalC.dylib). Belonging to [maintenance/v1.12]: - #1934 - OpenModelica/OpenModelica-testsuite#751
1 parent a3c03e3 commit 47881a3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile.common

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,18 +491,18 @@ $(LIBMODELICAEXTERNALC):
491491
$(MAKE) -C "$(MODELICAEXTERNALC)/BuildProjects/autotools"
492492
$(MAKE) -C "$(MODELICAEXTERNALC)/BuildProjects/autotools" install
493493
test ! `uname` = Darwin || install_name_tool -id @rpath/libModelicaExternalC.0.dylib "$@"
494+
test ! `uname` = Darwin || (install_name_tool -id @rpath/libModelicaStandardTables.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAMATIO:%.dylib=%.0.dylib)" @rpath/libModelicaMatIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
495+
test ! `uname` = Darwin || (install_name_tool -id @rpath/libzlib.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
496+
test ! `uname` = Darwin || (install_name_tool -id @rpath/libModelicaIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAMATIO:%.dylib=%.0.dylib)" @rpath/libModelicaMatIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
497+
test ! `uname` = Darwin || (install_name_tool -id @rpath/libModelicaMatIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
494498
@test -f "$@"
495499
$(LIBMODELICASTANDARDTABLES): $(LIBMODELICAEXTERNALC)
496-
test ! `uname` = Darwin || (install_name_tool -id @rpath/libModelicaStandardTables.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAMATIO:%.dylib=%.0.dylib)" @rpath/libModelicaMatIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
497500
@test -f "$@"
498501
$(LIBMODELICAZLIB): $(LIBMODELICAEXTERNALC)
499-
test ! `uname` = Darwin || (install_name_tool -id @rpath/libzlib.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
500502
@test -f "$@"
501503
$(LIBMODELICAIO): $(LIBMODELICAEXTERNALC)
502-
test ! `uname` = Darwin || (install_name_tool -id @rpath/libModelicaIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAMATIO:%.dylib=%.0.dylib)" @rpath/libModelicaMatIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
503504
@test -f "$@"
504505
$(LIBMODELICAMATIO): $(LIBMODELICAEXTERNALC)
505-
test ! `uname` = Darwin || (install_name_tool -id @rpath/libModelicaMatIO.0.dylib "$@" && install_name_tool -change "$(LIBMODELICAZLIB:%.dylib=%.0.dylib)" @rpath/libzlib.0.dylib "$@")
506506
@test -f "$@"
507507

508508
git-clean:

0 commit comments

Comments
 (0)