- Fix for when libf2c is installed on the system

- Also, don't compile our f2c if it is git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8339 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 24, 2011 · 3069ea4 · 3069ea4
1 parent a003abd
commit 3069ea4
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 140 deletions.
diff --git a/Compiler/susan_codegen/SimCode/SimCodeC.tpl b/Compiler/susan_codegen/SimCode/SimCodeC.tpl
@@ -2297,7 +2297,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
 
   .PHONY: <%fileNamePrefix%>
   <%fileNamePrefix%>: <%fileNamePrefix%>.conv.cpp <%fileNamePrefix%>_functions.cpp <%fileNamePrefix%>_functions.h <%fileNamePrefix%>_records.c
-  <%\t%> $(CXX) -I. -o <%fileNamePrefix%>$(EXEEXT) <%fileNamePrefix%>.conv.cpp <%fileNamePrefix%>_functions.cpp <%dirExtra%> <%libsPos1%> <%libsPos2%> -lsim -linteractive $(CFLAGS) $(SENDDATALIBS) $(LDFLAGS) -lf2c <%fileNamePrefix%>_records.c 
+  <%\t%> $(CXX) -I. -o <%fileNamePrefix%>$(EXEEXT) <%fileNamePrefix%>.conv.cpp <%fileNamePrefix%>_functions.cpp <%dirExtra%> <%libsPos1%> <%libsPos2%> -lsim -linteractive $(CFLAGS) $(SENDDATALIBS) $(LDFLAGS) -Wl,-Bstatic -lf2c -Wl,-Bdynamic <%fileNamePrefix%>_records.c 
   <%fileNamePrefix%>.conv.cpp: <%fileNamePrefix%>.cpp
   <%\t%> $(PERL) <%makefileParams.omhome%>/share/omc/scripts/convert_lines.pl $< $@.tmp
   <%\t%> @mv $@.tmp $@
@@ -4560,6 +4560,7 @@ template daeExpCrefRhs2(Exp ecr, Context context, Text &preExp /*BUFP*/,
       match arrayType
         case "metatype_array" then
           'arrayGet(<%arrName%>,<%dimsValuesStr%>) /* DAE.CREF */'
+
         else
           <<
           (*<%arrayType%>_element_addr(&<%arrName%>, <%dimsLenStr%>, <%dimsValuesStr%>))

diff --git a/c_runtime/Makefile.common b/c_runtime/Makefile.common
@@ -128,19 +128,19 @@ libf2c/libf2c.a :
 meta_modelica_catch.o : meta_modelica_catch.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -g $<
 
-install: libc_runtime.a libsim.a libf2c/libf2c.a interactive/libinteractive.a $(LIBSENDDATA) omdevinstall ModelicaExternalC/libModelicaExternalC.a
+install: libc_runtime.a libsim.a $(LIBF2C) interactive/libinteractive.a $(LIBSENDDATA) omdevinstall ModelicaExternalC/libModelicaExternalC.a
 	cp $(HFILES) $(builddir_inc)/
 	cp fmu_model_interface.c $(builddir_inc)/
 	cp $(LIBS) $(builddir_lib)/
-	cp libf2c/libf2c.* $(builddir_lib)/
+	test -z "$(LIBF2C)" || cp libf2c/libf2c.* $(builddir_lib)/
 	test -z "$(LIBSENDDATA)" || cp sendData/release/$(LIBSENDDATA) $(builddir_lib)/
 	cp interactive/libinteractive.a $(builddir_lib)/
 	@$(MAKE) -C java_interface -f $(JAVAMAKEFILE) && \
 	$(MAKE) -C java_interface -f $(JAVAMAKEFILE) install || \
 	$(MAKE) -C java_interface -f $(JAVAMAKEFILE) install-nomodelica
 
 clean :
-	$(MAKE) -C libf2c -f $(LIBF2CMAKEFILE) clean
+	test -z "$(LIBF2C)" || $(MAKE) -C libf2c -f $(LIBF2CMAKEFILE) clean
 	$(MAKE) -C java_interface -f $(JAVAMAKEFILE) clean
 	$(MAKE) -C interactive -f $(INTERACTIVEMAKEFILE) clean
 	$(MAKE) -C ModelicaExternalC -f $(EXTERNALCMAKEFILE) clean

diff --git a/c_runtime/Makefile.in b/c_runtime/Makefile.in
@@ -21,6 +21,8 @@ INTERACTIVELIBS = "-lpthread"
 LIBSENDDATA = @LIBSENDDATA@
 QMAKE=@QMAKE@
 CONFIG_H=$(top_builddir)/Compiler/runtime/config.h $(top_builddir)/Compiler/runtime/config.unix.h
+# Use f2c from the OS itself...
+LIBF2C=@LIBF2C@
 
 include Makefile.common