Build: HOST_CXX -> USE_HOST_CXX

Allow HOST_CXX to be passed to make which will be the actual host C++ compiler used, such as 'make HOST_CXX=clang++'.
akimdi · Jan 2, 2020 · d611319 · d611319
1 parent c617007
commit d611319
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/AK/Tests/Makefile b/AK/Tests/Makefile
@@ -17,7 +17,7 @@ APPS = ${SRCS:.cpp=}
 
 EXTRA_CLEAN = $(APPS) *.o
 
-HOST_CXX = 1
+USE_HOST_CXX = 1
 
 include ../../Makefile.common
 

diff --git a/DevTools/FormCompiler/Makefile b/DevTools/FormCompiler/Makefile
@@ -1,4 +1,4 @@
-HOST_CXX = 1
+USE_HOST_CXX = 1
 
 PROGRAM = FormCompiler
 

diff --git a/DevTools/IPCCompiler/Makefile b/DevTools/IPCCompiler/Makefile
@@ -1,4 +1,4 @@
-HOST_CXX = 1
+USE_HOST_CXX = 1
 
 PROGRAM = IPCCompiler
 

diff --git a/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Makefile b/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Makefile
@@ -1,4 +1,4 @@
-HOST_CXX = 1
+USE_HOST_CXX = 1
 
 PROGRAM = Generate_CSS_PropertyID_cpp
 

diff --git a/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_h/Makefile b/Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_h/Makefile
@@ -1,4 +1,4 @@
-HOST_CXX = 1
+USE_HOST_CXX = 1
 
 PROGRAM = Generate_CSS_PropertyID_h
 

diff --git a/Makefile.common b/Makefile.common
@@ -22,12 +22,16 @@ INCLUDE_FLAGS += \
 
 VERBOSE = 0
 
-ifneq ($(HOST_CXX),)
+ifneq ($(USE_HOST_CXX),)
  ifeq '' '$(findstring clang++,$(CXX))'
  C_WARNING_FLAGS += -Wno-unknown-warning-option
  CXX_WARNING_FLAGS += -Wno-unknown-warning-option
  endif
- CXX = $(PRE_CXX) g++
+ ifeq ($(HOST_CXX),)
+ CXX = $(PRE_CXX) g++
+ else
+ CXX = $(HOST_CXX)
+ endif
  AS = as
  LINK = ld
  OBJ_SUFFIX ?= .host