Use correct bootstrapping header during stage 1

OpenModelica · Feb 11, 2016 · 70ce925 · 70ce925
1 parent d422fe7
commit 70ce925
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/Parser/BaseModelica_Lexer.g b/Parser/BaseModelica_Lexer.g
@@ -189,7 +189,7 @@ IDENT;
 
 @includes {
   #include "ModelicaParserCommon.h"
-  #include "runtime/errorext.h"
+  #include "errorext.h"
 }
 
 T_ALGORITHM : 'algorithm';

diff --git a/Parser/Makefile.common b/Parser/Makefile.common
@@ -4,7 +4,6 @@ ANTLRJAR = $(ANTLR)/../tool/antlr-3.2.jar
 #ANTLRJAR = $(ANTLR)/../tool/antlr-3.4-complete.jar
 ANTLRCMD=java -cp $(ANTLRJAR) org.antlr.Tool -Xconversiontimeout 10000 -report
 
-COMPILERHOME=../Compiler/
 BUILDINC = -I../Compiler/runtime -I../SimulationRuntime/c/meta -I../SimulationRuntime/c/ -I../SimulationRuntime/c/meta/gc -I../SimulationRuntime/c/util
 
 .PHONY: all

diff --git a/Parser/Makefile.in b/Parser/Makefile.in
@@ -1,7 +1,7 @@
 CC=@CC@
 CXX=@CXX@
 CFLAGS=@CFLAGS@ -Wall @EXTRA_CFLAGS_GENERATED_CODE@
-CPPFLAGS=@CPPFLAGS@ -I$(COMPILERHOME) $(RMLINC) -I. -I$(ANTLR) -I$(ANTLR)/include -I../3rdParty/gc/include $(BUILDINC)
+CPPFLAGS=@CPPFLAGS@ $(RMLINC) -I. -I$(ANTLR) -I$(ANTLR)/include -I../3rdParty/gc/include $(BUILDINC)
 OMC=../build/bin/omc
 SHREXT=@SHREXT@
 ifeq (x86_64,@target_cpu@)

diff --git a/Parser/Makefile.omdev.mingw b/Parser/Makefile.omdev.mingw
@@ -1,7 +1,7 @@
 CC=gcc
 CXX=g++
 CFLAGS=-O3 -Wall
-CPPFLAGS=-I$(COMPILERHOME) $(RMLINC) -I.. -I. -I$(ANTLR) -I$(ANTLR)/include $(BUILDINC) -I../3rdParty/gc/include
+CPPFLAGS=$(RMLINC) -I.. -I. -I$(ANTLR) -I$(ANTLR)/include $(BUILDINC) -I../3rdParty/gc/include
 
 OMBUILDDIR=../build
 OMC=../build/bin/omc.exe

diff --git a/Parser/Modelica.g b/Parser/Modelica.g
@@ -46,7 +46,7 @@ import MetaModelica_Lexer; /* Makes all tokens defined, imported in OptiMo_Lexer
   #include <time.h>
 
   #include "ModelicaParserCommon.h"
-  #include "runtime/errorext.h"
+  #include "errorext.h"
 
   #define ModelicaParserException 100
   #define ModelicaLexerException  200

diff --git a/Parser/parse.c b/Parser/parse.c
@@ -43,8 +43,8 @@
 #include <antlr3intstream.h>
 #include <antlr3config.h>
 
-#include "runtime/errorext.h"
-#include "runtime/systemimpl.h"
+#include "errorext.h"
+#include "systemimpl.h"
 
 pthread_once_t parser_once_create_key = PTHREAD_ONCE_INIT;
 pthread_key_t modelicaParserKey;