Skip to content

Commit

Permalink
- disable parallel mark for GC in Windows as it crashes dll loading
Browse files Browse the repository at this point in the history
- override CFLAGS in some places so the CFLAGS given at command line get propagated correctly
- remove MMC_INIT from in_function generated for dll loading


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23109 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Oct 31, 2014
1 parent b3d2e0e commit 405cae2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion Compiler/Template/CodegenC.tpl
Expand Up @@ -5624,7 +5624,6 @@ template generateInFunc(Text fname, list<Variable> functionArguments, list<Varia
<%functionArguments |> var => '<%funArgDefinition(var)%>;' ;separator="\n"%>
<%outVars |> var => '<%funArgDefinition(var)%>;' ;separator="\n"%>
<%functionArguments |> arg => readInVar(arg) ;separator="\n"%>
MMC_INIT();
MMC_TRY_TOP()
<%match outVars
case v::_ then '<%funArgName(v)%> = '
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/Makefile.common
Expand Up @@ -7,7 +7,7 @@
include Makefile.objs

CPPFLAGS = -I. -I$(UTILPATH) -I. -I$(METAPATH) -I$(METAPATH)gc $(LIBF2CINC) -I$(top_builddir)/3rdParty/gc/include -I$(top_builddir)/3rdParty/FMIL/install/include/ -I$(top_builddir)/3rdParty/lis-1.4.12/include/ -I$(top_builddir)/3rdParty/Ipopt-3.11.6/include/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL
CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS) $(EXTRA_CFLAGS)
override CFLAGS += $(CPPFLAGS) $(CONFIG_CFLAGS) $(EXTRA_CFLAGS)
CXXFLAGS = $(CFLAGS)
FFLAGS = -O -fexceptions
# P.A: before, g77 had -O3 or -O2 but that caused a bug in DDASRT, giving infinite loop.
Expand Down

0 comments on commit 405cae2

Please sign in to comment.