Fix problems with errorext bootstrapping linking

OpenModelica · Apr 7, 2016 · b0f6026 · b0f6026
1 parent 2c7da6d
commit b0f6026
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Compiler/runtime/Makefile.common b/Compiler/runtime/Makefile.common
@@ -87,9 +87,13 @@ FMI_omc$(OBJEXT) : FMIImpl.c $(BOOTH)
 GraphStreamExt_omc$(OBJEXT) : $(BOOTH) GraphStreamExt_impl.cpp $(RML_COMPAT)
 
 %.boot.o: %.c
-	$(CC) -c -o "$@" "$<" $(CFLAGS) $(CPPFLAGS)
+	$(CC) -c -o "$@" "$<" $(CFLAGS) $(CPPFLAGS) -I../boot/tarball-include/
 %.boot.o: %.cpp
-	$(CXX) -c -o "$@" "$<" $(CXXFLAGS) $(CPPFLAGS)
+	$(CXX) -c -o "$@" "$<" $(CXXFLAGS) $(CPPFLAGS) -I../boot/tarball-include/
+%.o: %.c
+	$(CC) -c -o "$@" "$<" $(CFLAGS) $(CPPFLAGS) -I..
+%.o: %.cpp
+	$(CXX) -c -o "$@" "$<" $(CXXFLAGS) $(CPPFLAGS) -I..
 
 clean:
 	$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-*

diff --git a/Compiler/runtime/Makefile.in b/Compiler/runtime/Makefile.in
@@ -31,7 +31,7 @@ CXX	= @CXX@
 IDL	= @IDLCMD@
 IDLPYTHON = @IDLPYTHONCMD@
 CXXFLAGS = $(CFLAGS)
-CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I.. -I. $(CORBAINCL) -I$(FMIINCLUDE) -I$(top_builddir)/3rdParty/gc/include -I$(GRAPHSTREAMINCLUDE) -I$(GRAPHINCLUDE) -I$(CJSONINCLUDE)
+CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I. $(CORBAINCL) -I$(FMIINCLUDE) -I$(top_builddir)/3rdParty/gc/include -I$(GRAPHSTREAMINCLUDE) -I$(GRAPHINCLUDE) -I$(CJSONINCLUDE)
 TRIPLE=@host_short@
 
 include Makefile.common