better naming scheme for stage variables in debian/rules

establish a consistent STAGE_[stage]_ prefix naming scheme for stage variables and replace STAGE1_AND_STAGE2_ prefix with STAGE_ALL_ prefix for better future-proofing
2025-06-14 14:47:14 +00:00 · 2021-10-21 21:26:22 -07:00 · 2021-10-21 21:26:22 -07:00 · 2e88154bcc
commit 2e88154bcc
parent feeebfb2e9
1 changed files with 55 additions and 55 deletions
--- a/debian/rules
+++ b/debian/rules
@ -61,22 +61,22 @@ LDFLAGS_EXTRA = $(shell dpkg-buildflags --get LDFLAGS)
 # See https://llvm.org/docs/AdvancedBuilds.html

 # stage 1 toolchain build only
-STAGE1_CFLAGS_EXTRA = $(CFLAGS_EXTRA)
-STAGE1_CXXFLAGS_EXTRA = $(CXXFLAGS_EXTRA)
-STAGE1_LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)
+STAGE_1_CFLAGS_EXTRA = $(CFLAGS_EXTRA)
+STAGE_1_CXXFLAGS_EXTRA = $(CXXFLAGS_EXTRA)
+STAGE_1_LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)
 # stage 2 toolchain and stand-alone builds
-STAGE2_CFLAGS_EXTRA = $(CFLAGS_EXTRA)
-STAGE2_CXXFLAGS_EXTRA = $(CXXFLAGS_EXTRA)
-STAGE2_LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)
+STAGE_2_CFLAGS_EXTRA = $(CFLAGS_EXTRA)
+STAGE_2_CXXFLAGS_EXTRA = $(CXXFLAGS_EXTRA)
+STAGE_2_LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)

 # toolchain build cmake options
-STAGE1_CMAKE_EXTRA =
-STAGE2_CMAKE_EXTRA = -DPYTHON_EXECUTABLE=/usr/bin/python3
-STAGE1_AND_STAGE2_CMAKE_EXTRA =
+STAGE_1_CMAKE_EXTRA =
+STAGE_2_CMAKE_EXTRA = -DPYTHON_EXECUTABLE=/usr/bin/python3
+STAGE_ALL_CMAKE_EXTRA =
 # build-only var combining all first stage cmake options
-CMAKE_EXTRA = $(STAGE1_CMAKE_EXTRA) $(STAGE1_AND_STAGE2_CMAKE_EXTRA)
+CMAKE_EXTRA = $(STAGE_1_CMAKE_EXTRA) $(STAGE_ALL_CMAKE_EXTRA)
 # build-only var prepending BOOTSTRAP_ prefix to all stage 2 cmake vars
-BOOTSTRAP_CMAKE_EXTRA = $(foreach extra,$(STAGE2_CMAKE_EXTRA) $(STAGE1_AND_STAGE2_CMAKE_EXTRA), $(subst -D,-DBOOTSTRAP_,$(extra)))
+BOOTSTRAP_CMAKE_EXTRA = $(foreach extra,$(STAGE_2_CMAKE_EXTRA) $(STAGE_ALL_CMAKE_EXTRA), $(subst -D,-DBOOTSTRAP_,$(extra)))

 BASE_PATH := $(CURDIR)
 STAGE1_BIN_DIR := $(BASE_PATH)/$(TARGET_BUILD)/bin
@ -90,7 +90,7 @@ LIBCXX_EXCEPTIONS := ON
 LIBCXX_USE_COMPILER_RT := ON

 ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64))
-STAGE1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4
+STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4
 endif

 ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mips mipsel powerpc powerpcspe riscv64))
@ -112,14 +112,14 @@ ifneq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 	Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON
 endif
 endif
-STAGE2_CMAKE_EXTRA += $(Z3_FLAG)
+STAGE_2_CMAKE_EXTRA += $(Z3_FLAG)

 # Change the default CPU for s390x
 ZARCH=z196
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
 ZARCH=z13
 endif
-STAGE2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)
+STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH)

 export CC=gcc-$(GCC_VERSION)
 export CXX=g++-$(GCC_VERSION)
@ -129,37 +129,37 @@ opt_flags = -O2 -DNDEBUG -g1
 ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
 # https://wiki.debian.org/ArmEabiPort
 # since debian buster (10) armel baseline is 5T
-  STAGE2_CFLAGS_EXTRA += -march=armv5t
-  STAGE2_CXXFLAGS_EXTRA += -march=armv5t
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabi
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+  STAGE_2_CFLAGS_EXTRA += -march=armv5t
+  STAGE_2_CXXFLAGS_EXTRA += -march=armv5t
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabi
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 # 12 still failing to build, disable the compiler_rt builtins
 # See http://lists.llvm.org/pipermail/llvm-dev/2016-May/099761.html
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
  COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
 # See https://bugs.llvm.org/show_bug.cgi?id=52022
  LIBCXX_USE_COMPILER_RT := OFF
 endif

 ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabihf
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabihf
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 endif

 ifneq (,$(filter $(DEB_HOST_ARCH),i386))
 # Sometimes, i386 needs help with the triple
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu
 endif

 ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
 # avoid an issue with search path on mips64el
 # https://bugs.llvm.org/show_bug.cgi?id=41204
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64
 endif

 ifneq (,$(filter $(DEB_HOST_ARCH),x32))
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=x86_64-linux-gnux32
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-linux-gnux32
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=x86_64-linux-gnux32
+  STAGE_ALL_CMAKE_EXTRA += -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-linux-gnux32
 # See https://bugs.llvm.org/show_bug.cgi?id=52022
  LIBCXX_USE_COMPILER_RT := OFF
 endif
@ -194,8 +194,8 @@ endif
 BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
 ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
-	STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold
-	STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_BINUTILS_INCDIR=/usr/include/
+	STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold
+	STAGE_ALL_CMAKE_EXTRA += -DLLVM_BINUTILS_INCDIR=/usr/include/
 endif
 endif

@ -208,7 +208,7 @@ ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS)))
 	LDFLAGS_EXTRA += -coverage -lgcov
 	RUN_TEST=yes
    # OpenMP doesn't respect LDFLAGS
-    STAGE2_CMAKE_EXTRA+= -DLIBOMP_LDFLAGS="-coverage -lgcov" # don't pass LDFLAGS_EXTRA because it expects gcc arg
+    STAGE_2_CMAKE_EXTRA+= -DLIBOMP_LDFLAGS="-coverage -lgcov" # don't pass LDFLAGS_EXTRA because it expects gcc arg
 endif

 # Enable polly (or not)
@ -225,7 +225,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel hurd-i386 powerpc sparc sp
  LIBUNWIND_ENABLE=no
 else
  RUNTIMES += ;libunwind
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON
+  STAGE_ALL_CMAKE_EXTRA += -DLIBCXXABI_USE_LLVM_UNWINDER=ON
 endif

 # Enable openmp (or not)
@ -234,9 +234,9 @@ ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel powerpc powerpcspe sparc64 s390x
  OPENMP_ENABLE=no
 else
  RUNTIMES+=;openmp
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLIBOMP_LIBFLAGS="-lm"
+  STAGE_ALL_CMAKE_EXTRA += -DLIBOMP_LIBFLAGS="-lm"
 ifeq ($(LIBUNWIND_ENABLE),yes)
-  STAGE1_AND_STAGE2_CMAKE_EXTRA += -DOPENMP_USE_LLVM_UNWINDER=ON
+  STAGE_ALL_CMAKE_EXTRA += -DOPENMP_USE_LLVM_UNWINDER=ON
 endif
 endif

@ -266,7 +266,7 @@ ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS)))
 # no need to run tests in this case
 	RUN_TEST=no
 	CONFIGURE_EXTRA += --enable-assertions
-	STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
+	STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
 endif

 ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS)))
@ -279,7 +279,7 @@ ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS)))
 	PRE_PROCESS_CONF=
 	COVERITY_ENABLE=1
 	CONFIGURE_EXTRA += --enable-assertions
-	STAGE1_AND_STAGE2_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
+	STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
 # no need to run tests in this case
 	RUN_TEST=no
 else
@ -300,7 +300,7 @@ LLD_ENABLE=yes

 ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
 # only for linux
-	STAGE2_CMAKE_EXTRA += -DLLVM_USE_PERF=ON -DLLVM_ENABLE_LIBPFM=ON
+	STAGE_2_CMAKE_EXTRA += -DLLVM_USE_PERF=ON -DLLVM_ENABLE_LIBPFM=ON
 endif

 # Only enable it for archs supporting gold
@ -314,7 +314,7 @@ ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
 # * LLVM_ENABLE_LTO doesn't work with gcc >= 9 (option not accepted)
 # * BOOTSTRAP_LLVM_ENABLE_LTO is producing some large binary
 #   See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=943623
-#	STAGE2_CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
+#	STAGE_2_CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
 endif
 endif

@ -466,11 +466,11 @@ override_dh_auto_configure: preconfigure
 	-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \
 	-DCMAKE_SUPPRESS_REGENERATION=ON \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_C_FLAGS="$(STAGE1_CFLAGS_EXTRA)" \
-	-DCMAKE_CXX_FLAGS="$(STAGE1_CXXFLAGS_EXTRA)" \
-	-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE1_LDFLAGS_EXTRA)" \
-	-DCMAKE_MODULE_LINKER_FLAGS="$(STAGE1_LDFLAGS_EXTRA)" \
-	-DCMAKE_EXE_LINKER_FLAGS="$(STAGE1_LDFLAGS_EXTRA)" \
+	-DCMAKE_C_FLAGS="$(STAGE_1_CFLAGS_EXTRA)" \
+	-DCMAKE_CXX_FLAGS="$(STAGE_1_CXXFLAGS_EXTRA)" \
+	-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_1_LDFLAGS_EXTRA)" \
+	-DCMAKE_MODULE_LINKER_FLAGS="$(STAGE_1_LDFLAGS_EXTRA)" \
+	-DCMAKE_EXE_LINKER_FLAGS="$(STAGE_1_LDFLAGS_EXTRA)" \
 	-DPACKAGE_VENDOR=$(VENDOR) \
 	-DENABLE_LINKER_BUILD_ID=ON \
 	-DLLVM_TARGETS_TO_BUILD=Native \
@ -510,18 +510,18 @@ override_dh_auto_configure: preconfigure
 	-DLIBOMP_ENABLE_RTTI=OFF \
 	-DLIBOMP_OMPT_SUPPORT=OFF \
 	$(CMAKE_EXTRA) \
-	-DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE1_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE1_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE1_LDFLAGS_EXTRA);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE1_LDFLAGS_EXTRA);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE1_LDFLAGS_EXTRA);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
-	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE1_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE1_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE1_LDFLAGS_EXTRA);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE1_LDFLAGS_EXTRA);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE1_LDFLAGS_EXTRA);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
+	-DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS_EXTRA);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS_EXTRA);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS_EXTRA);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
+	-DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS_EXTRA);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS_EXTRA);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS_EXTRA);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
 	-DCLANG_ENABLE_BOOTSTRAP=ON \
 	-DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \
 	-DBOOTSTRAP_CMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DBOOTSTRAP_CMAKE_C_FLAGS_RELWITHDEBINFO="$(opt_flags)" \
 	-DBOOTSTRAP_CMAKE_CXX_FLAGS_RELWITHDEBINFO="$(opt_flags)" \
-	-DBOOTSTRAP_CMAKE_C_FLAGS="$(STAGE2_CFLAGS_EXTRA)" \
-	-DBOOTSTRAP_CMAKE_CXX_FLAGS="$(STAGE2_CXXFLAGS_EXTRA)" \
-	-DBOOTSTRAP_CMAKE_SHARED_LINKER_FLAGS="$(STAGE2_LDFLAGS_EXTRA)" \
-	-DBOOTSTRAP_CMAKE_MODULE_LINKER_FLAGS="$(STAGE2_LDFLAGS_EXTRA)" \
-	-DBOOTSTRAP_CMAKE_EXE_LINKER_FLAGS="$(STAGE2_LDFLAGS_EXTRA)" \
+	-DBOOTSTRAP_CMAKE_C_FLAGS="$(STAGE_2_CFLAGS_EXTRA)" \
+	-DBOOTSTRAP_CMAKE_CXX_FLAGS="$(STAGE_2_CXXFLAGS_EXTRA)" \
+	-DBOOTSTRAP_CMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS_EXTRA)" \
+	-DBOOTSTRAP_CMAKE_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS_EXTRA)" \
+	-DBOOTSTRAP_CMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS_EXTRA)" \
 	-DBOOTSTRAP_LLVM_ENABLE_FFI=ON \
 	-DBOOTSTRAP_LLVM_ENABLE_DUMP=ON \
 	-DBOOTSTRAP_LLVM_ENABLE_LIBPFM=ON \
@ -537,8 +537,8 @@ override_dh_auto_configure: preconfigure
 	-DBOOTSTRAP_LIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \
 	-DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \
 	$(BOOTSTRAP_CMAKE_EXTRA) \
-	-DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE2_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE2_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE2_LDFLAGS_EXTRA);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE2_LDFLAGS_EXTRA);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE2_LDFLAGS_EXTRA);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
-	-DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE2_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE2_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE2_LDFLAGS_EXTRA) -L$(STAGE1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE2_LDFLAGS_EXTRA) -L$(STAGE1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE2_LDFLAGS_EXTRA) -L$(STAGE1_LIB_DIR);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
+	-DBOOTSTRAP_BUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS_EXTRA);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS_EXTRA);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS_EXTRA);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
+	-DBOOTSTRAP_RUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_2_CFLAGS_EXTRA);-DCMAKE_CXX_FLAGS=$(STAGE_2_CXXFLAGS_EXTRA);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_2_LDFLAGS_EXTRA) -L$(STAGE1_LIB_DIR);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_2_LDFLAGS_EXTRA) -L$(STAGE1_LIB_DIR);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_2_LDFLAGS_EXTRA) -L$(STAGE1_LIB_DIR);-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(opt_flags);-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(opt_flags);-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \
 	-DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_ENABLE_SHARED;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_SHARED;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_SHARED;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;PYTHON_EXECUTABLE"
 	FOUND_VERSION=`grep LLVM_VERSION_STRING build-llvm/include/llvm/Config/llvm-config.h|cut -d\" -f2`; \
 	if ! echo "$(LLVM_VERSION_FULL)"|grep "$$FOUND_VERSION"; then \
@ -569,7 +569,7 @@ debian-full-build:
 debian-libfuzzer-build:
 ifeq (${LIBFUZZER_ENABLE},yes)
 	cd $(TARGET_BUILD); \
-	CFLAGS="$(opt_flags) $(STAGE2_CFLAGS_EXTRA)"; \
+	CFLAGS="$(opt_flags) $(STAGE_2_CFLAGS_EXTRA)"; \
 	echo $$CFLAGS; \
 	$(STAGE2_BIN_DIR)/clang++ -c $$CFLAGS -std=c++11 $(BASE_PATH)/compiler-rt/lib/fuzzer/*.cpp -IFuzzer; \
 	ar ruv libFuzzer.a Fuzzer*.o
@ -585,11 +585,11 @@ debian-libclc-build:
 	-G $(GENERATOR) \
 	-DCMAKE_C_COMPILER=$(STAGE2_BIN_DIR)/clang \
 	-DCMAKE_CXX_COMPILER=$(STAGE2_BIN_DIR)/clang++ \
-	-DCMAKE_C_FLAGS="$(opt_flags) $(STAGE2_CFLAGS_EXTRA)" \
-	-DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE2_CXXFLAGS_EXTRA)" \
-	-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE2_LDFLAGS_EXTRA) -L$(STAGE2_LIB_DIR)" \
-	-DCMAKE_MODULE_LINKER_FLAGS="$(STAGE2_LDFLAGS_EXTRA) -L$(STAGE2_LIB_DIR)" \
-	-DCMAKE_EXE_LINKER_FLAGS="$(STAGE2_LDFLAGS_EXTRA) -L$(STAGE2_LIB_DIR)" \
+	-DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_CFLAGS_EXTRA)" \
+	-DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_CXXFLAGS_EXTRA)" \
+	-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS_EXTRA) -L$(STAGE2_LIB_DIR)" \
+	-DCMAKE_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS_EXTRA) -L$(STAGE2_LIB_DIR)" \
+	-DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS_EXTRA) -L$(STAGE2_LIB_DIR)" \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_INSTALL_DATADIR=lib \
 	-DCMAKE_INSTALL_INCLUDEDIR=include \