Skip to content

Commit edc5e21

Browse files
committed
Remove dlinpk.c since the nightly builds complain about duplicate symbols
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20007 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent b236ab8 commit edc5e21

File tree

3 files changed

+3
-1299
lines changed

3 files changed

+3
-1299
lines changed

SimulationRuntime/c/Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ libSimulationRuntimeC.a: $(ALL_OBJS)
107107

108108
ranlib $@
109109

110-
libSimulationRuntimeC.so: $(ALL_OBJS) $(builddir_lib)/libf2c.a
110+
libSimulationRuntimeC.so: $(ALL_OBJS) $(builddir_lib)/libf2c.a $(builddir_lib)/libcdaskr.a
111111
@rm -f $@
112112
$(CC) -shared -o $@ $(ALL_OBJS) $(LDFLAGS_SIM)
113113

114-
libSimulationRuntimeC.dylib: $(ALL_OBJS) $(builddir_lib)/libf2c.a
114+
libSimulationRuntimeC.dylib: $(ALL_OBJS) $(builddir_lib)/libf2c.a $(builddir_lib)/libcdaskr.a
115115
@rm -f $@
116116
$(CC) -shared -o $@ $(ALL_OBJS) $(LDFLAGS_SIM) -undefined dynamic_lookup -install_name '@rpath/$@'
117117

SimulationRuntime/c/math-support/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# Quellen und Header
55
SET(math_support_sources bigden.c biglag.c dogleg.c dpmpar.c
6-
dlamch.c dlinpk.c
6+
dlamch.c
77
enorm.c fdjac1.c hybrd.c hybrd1.c hybrj.c lsame.c
88
nelmead.c newuoa.c newuob.c pivot.c qform.c qrfac.c r1mpyq.c
99
r1updt.c trsapp.c update.c)

0 commit comments

Comments
 (0)