Regenerate OpenModelicaBootstrappingHeader.h also for the bootstrappe…

…d target

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18226 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Makefile.common

@@ -40,6 +40,23 @@ mkbuilddirs:
 
 release: omc-diff omc
 
+omc-bootstrapped:
+	if test -f @OMC@; then $(MAKE) bootstrap-from-compiled; else $(MAKE) bootstrap-from-tarball; fi
+
+# configure --without-rml works using this target
+bootstrap-from-tarball:
+	$(MAKE) bootstrap-dependencies
+	time $(MAKE) -C testsuite/openmodelica/bootstrapping -f LinkMain.makefile bootstrap-from-tarball
+	$(MAKE) omlibrary
+
+bootstrap-dependencies: omc-diff interactive docs fmi fmil opencl_rt lis
+	# NOTE: OpenModelicaBootstrappingHeader.h has to be regenerated without any other process writing to so/etc or you get bus errors
+	$(MAKE) -C Compiler OpenModelicaBootstrappingHeader.h
+	$(MAKE) -C Compiler/runtime install
+	$(MAKE) -C Compiler builtin install_scripts
+	$(MAKE) -C Parser install
+	$(MAKE) -C Compiler/modpar install
+
 install-python:
 	(time $(MAKE) -C PythonInterface -f $(defaultMakefileTarget))
 

Makefile.in

@@ -103,28 +103,13 @@ qtclean: qtclean-common
 	$(MAKE) -C OMOptimBasis/build -f Makefile.unix clean
 endif
 
-omc-bootstrapped:
-	if test -f @OMC@; then $(MAKE) bootstrap-from-compiled; else $(MAKE) bootstrap-from-tarball; fi
-
-# configure --without-rml works using this target
-bootstrap-from-tarball:
-	$(MAKE) bootstrap-dependencies
-	time $(MAKE) -C testsuite/openmodelica/bootstrapping -f LinkMain.makefile bootstrap-from-tarball
-	$(MAKE) omlibrary
-
 # configure --without-rml works using this target, but requires a compiled omc (either from bootstrap or regular one)
 bootstrap-from-compiled:
 	test -f @OMC@
 	$(MAKE) bootstrap-dependencies
 	$(MAKE) -C testsuite/openmodelica/bootstrapping -f LinkMain.makefile bootstrap-from-compiled
 	$(MAKE) omlibrary
 
-bootstrap-dependencies: omc-diff interactive docs fmi fmil opencl_rt lis
-	$(MAKE) -C Compiler/runtime install
-	$(MAKE) -C Compiler builtin install_scripts
-	$(MAKE) -C Parser install
-	$(MAKE) -C Compiler/modpar install
-
 modelica3d:
 ifeq (@MODELICA3D@,)
 	@echo Skipping Modelica3D