Changeset a9da941c in OpenModelica

Timestamp:

2020-10-20T17:08:45+02:00 (4 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

Children:

6c0faf90

Parents:

e7f512c

Message:

Change how OPENMODELICAHOME is handled

File:

• OMCompiler/Compiler/boot/Makefile.common (modified) (4 diffs)

OMCompiler/Compiler/boot/Makefile.common

@@ -15 +15 @@
   $(MAKE) -f $(defaultMakefileTarget) generate-files INCLUDESOURCES=1 INCLUDEDEPENDS=1
 
-.PHONY: interfaces generate-files runtime-depends parser compilerruntime patch-files
+.PHONY: interfaces generate-files runtime-depends parser compilerruntime patch-files bootstrap-from-tarball bootstrap-from-tarball2
 
 GEN_DIR=build/
@@ -37 +37 @@
 endif
 
-ifeq ($(BOOTSTRAP_OMHOME),1)
-else
-export OPENMODELICAHOME := $(OMBUILDDIR)
-endif
-
 %.patch: %.patch.xz
   xz --keep --decompress --force $<
@@ -48 +43 @@
 
 bootstrap-from-tarball:
+  OPENMODELICAHOME="$(OMBUILDDIR)" $(MAKE) -f $(defaultMakefileTarget) bootstrap-from-tarball2
+
+bootstrap-from-tarball2:
   $(MAKE) -f $(defaultMakefileTarget) clean OMC=.omc
   rm -rf $(GEN_DIR)
@@ -53 +51 @@
   cp -r bootstrap-sources/* .
   # Patch _main.c to avoid a new tarball
-  $(MAKE) -f $(defaultMakefileTarget) patch-files
-  $(PATCH_SOURCES)
+  #$(MAKE) -f $(defaultMakefileTarget) patch-files
+  #$(PATCH_SOURCES)
   # We have not compiled OpenModelicaScriptingAPI.mo yet
   touch build/OpenModelicaScriptingAPI.h
   $(MAKE) -f $(defaultMakefileTarget) install INCLUDESOURCES=1 OMC=.omc BOOTSTRAP_STAGE_1=1 CPPFLAGS="$(CPPFLAGS) -DOMC_BOOTSTRAPPING_STAGE_1"
   @echo "Bootstrapping phase 1/3 completed"
-  $(MAKE) -f $(defaultMakefileTarget) --no-print-directory clean OMC="$(BOOTSTRAP_OMC)" BOOTSTRAP_OMHOME=1
-  $(MAKE) -f $(defaultMakefileTarget) --no-print-directory runtime-depends OMBUILDDIR=$(OMBUILDDIR) OMC="$(BOOTSTRAP_OMC)" BOOTSTRAP_OMHOME=1
-  OPENMODELICA_BACKEND_STUBS=1 $(MAKE) -f $(defaultMakefileTarget) generate-files-in-steps OMC="$(BOOTSTRAP_OMC)" OMC_EXTRA_FLAGS= BOOTSTRAP_OMHOME=1 TEMPLATES_TARGET=templates-bootstrap
-  # Patch _main.c to avoid a new tarball
-  $(PATCH_SOURCES)
-  echo '#include "Patternm.h"' >> build/SimCodeFunctionUtil_includes.h
+  $(MAKE) -f $(defaultMakefileTarget) --no-print-directory clean OMC="$(BOOTSTRAP_OMC)"
+  $(MAKE) -f $(defaultMakefileTarget) --no-print-directory runtime-depends OMBUILDDIR=$(OMBUILDDIR) OMC="$(BOOTSTRAP_OMC)"
+  OPENMODELICA_BACKEND_STUBS=1 $(MAKE) -f $(defaultMakefileTarget) generate-files-in-steps OMC="$(BOOTSTRAP_OMC)" OMC_EXTRA_FLAGS= TEMPLATES_TARGET=templates-bootstrap
   # We have not compiled OpenModelicaScriptingAPI.mo yet
   touch build/OpenModelicaScriptingAPI.h
-  $(MAKE) -f $(defaultMakefileTarget) install INCLUDESOURCES=1 OMC="$(BOOTSTRAP_OMC)" CPPFLAGS="$(CPPFLAGS) -DOMC_BOOTSTRAPPING_STAGE_2" BOOTSTRAP_OMHOME=1
+  $(MAKE) -f $(defaultMakefileTarget) install INCLUDESOURCES=1 OMC="$(BOOTSTRAP_OMC)" CPPFLAGS="$(CPPFLAGS) -DOMC_BOOTSTRAPPING_STAGE_2"
   @echo "Bootstrapping phase 2/3 completed"
   $(MAKE) -f $(defaultMakefileTarget) clean OMC="$(BOOTSTRAP_OMC)"