Skip to content

Commit

Permalink
- Fix to build on OSX
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14136 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Nov 29, 2012
1 parent 817befa commit 64db10c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Makefile.common
Expand Up @@ -71,6 +71,10 @@ libgc-dev: /usr/include/gc/new_gc_alloc.h
libgc-dev: /usr/include/gc/weakpointer.h

boehm-gc: mkbuilddirs boehm-gc-lib build/include/omc/gc.h build/include/omc/gc_config_macros.h build/include/omc/gc_version.h
build/lib/omc/libgc.a: 3rdParty/gc-7.2/.libs/libgc.a mkbuilddirs
cp -p $< $@
3rdParty/gc-7.2/.libs/libgc.a: 3rdParty/gc-7.2/Makefile
$(MAKE) -C 3rdParty/gc-7.2/
build/include/omc/gc.h: 3rdParty/gc-7.2/include/gc.h mkbuilddirs
cp -pP $< $@
build/include/omc/gc_config_macros.h: 3rdParty/gc-7.2/include/gc_config_macros.h mkbuilddirs
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Expand Up @@ -36,7 +36,7 @@ omc: difftool interactive docs fmi fmil opencl_rt
omcd: difftool interactive docs fmi fmil opencl_rt
(cd Compiler && $(MAKE) -f Makefile debug)

boehm-gc-lib: build/lib/omc/libgc.so build/lib/omc/libgc.so.1 build/lib/omc/libgc.so.1.0.3
boehm-gc-lib: @LIBGC@
build/lib/omc/libgc.so: 3rdParty/gc-7.2/.libs/libgc.so mkbuilddirs
cp -pP $< $@
build/lib/omc/libgc.so.1: 3rdParty/gc-7.2/.libs/libgc.so.1 3rdParty/gc-7.2/.libs/libgc.so mkbuilddirs
Expand Down
3 changes: 3 additions & 0 deletions configure.in
Expand Up @@ -53,6 +53,7 @@ AC_SUBST(OMNOTEBOOK)
AC_SUBST(FPMATHFORTRAN)
AC_SUBST(OMOPTIM_CC)
AC_SUBST(OMOPTIM_CXX)
AC_SUBST(LIBGC)

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

Expand Down Expand Up @@ -622,8 +623,10 @@ fi

if test "Darwin" = `uname`; then
EXE=".app"
LIBGC="libgc.a"
else
EXE=""
LIBGC="libgc.so libgc.so.1 libgc.so.1.0.3"
fi

if test "Darwin" != `uname`; then
Expand Down

0 comments on commit 64db10c

Please sign in to comment.