diff options
| author | joshua stein <jcs@jcs.org> | 2020-01-01 20:03:06 -0600 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2020-01-02 21:03:53 +0100 |
| commit | d61131945d15e64cdf7ab0a2cbe584a915599428 (patch) | |
| tree | 9aff006bfc20d7a89e43ed09993d808da471f4f9 | |
| parent | c6170070edc1c6cf3707620a1300ec96a8db32c9 (diff) | |
| download | serenity-d61131945d15e64cdf7ab0a2cbe584a915599428.zip | |
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++'.
| -rw-r--r-- | AK/Tests/Makefile | 2 | ||||
| -rw-r--r-- | DevTools/FormCompiler/Makefile | 2 | ||||
| -rw-r--r-- | DevTools/IPCCompiler/Makefile | 2 | ||||
| -rw-r--r-- | Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_cpp/Makefile | 2 | ||||
| -rw-r--r-- | Libraries/LibHTML/CodeGenerators/Generate_CSS_PropertyID_h/Makefile | 2 | ||||
| -rw-r--r-- | Makefile.common | 8 |
6 files changed, 11 insertions, 7 deletions
diff --git a/AK/Tests/Makefile b/AK/Tests/Makefile index 13581e0758..abede6c7ba 100644 --- 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 index 9c8297b02e..df4308d3b7 100644 --- 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 index 1cc65ded59..151bf0f2cd 100644 --- 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 index 2fbac0c056..8b5a619135 100644 --- 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 index aff0892a8d..bc54f89441 100644 --- 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 index 4849feec65..27c7afb4c4 100644 --- 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 |