This is a preparatory change for simplifying the setting of
HOST{CC/CXX} and allowing the Xen build system to pick the toolchain
variables from the environment.No functional change intended. Signed-off-by: Roger Pau Monné <[email protected]> --- Cc: Andrew Cooper <[email protected]> Cc: George Dunlap <[email protected]> Cc: Ian Jackson <[email protected]> Cc: Jan Beulich <[email protected]> Cc: Julien Grall <[email protected]> Cc: Konrad Rzeszutek Wilk <[email protected]> Cc: Stefano Stabellini <[email protected]> Cc: Tim Deegan <[email protected]> Cc: Wei Liu <[email protected]> --- Config.mk | 18 ------------------ config/StdGNU.mk | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Config.mk b/Config.mk index 0fa4591379..57a6c934b3 100644 --- a/Config.mk +++ b/Config.mk @@ -39,24 +39,6 @@ DESTDIR ?= / # Allow phony attribute to be listed as dependency rather than fake target .PHONY: .phony -# If we are not cross-compiling, default HOSTC{C/XX} to C{C/XX} -ifeq ($(XEN_TARGET_ARCH), $(XEN_COMPILE_ARCH)) -HOSTCC ?= $(CC) -HOSTCXX ?= $(CXX) -endif - -# Use Clang/LLVM instead of GCC? -clang ?= n -ifeq ($(clang),n) -gcc := y -HOSTCC ?= gcc -HOSTCXX ?= g++ -else -gcc := n -HOSTCC ?= clang -HOSTCXX ?= clang++ -endif - DEPS_INCLUDE = $(addsuffix .d2, $(basename $(wildcard $(DEPS)))) DEPS_RM = $(DEPS) $(DEPS_INCLUDE) diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 039274ea61..7a6159021b 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -1,14 +1,30 @@ +# Use Clang/LLVM instead of GCC? +clang ?= n + +# If we are not cross-compiling, default HOSTC{C/XX} to C{C/XX} +ifeq ($(XEN_TARGET_ARCH), $(XEN_COMPILE_ARCH)) +HOSTCC ?= $(CC) +HOSTCXX ?= $(CXX) +endif + AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld ifeq ($(clang),y) +gcc := n CC = $(CROSS_COMPILE)clang CXX = $(CROSS_COMPILE)clang++ LD_LTO = $(CROSS_COMPILE)llvm-ld +HOSTCC ?= clang +HOSTCXX ?= clang++ else +gcc := y CC = $(CROSS_COMPILE)gcc CXX = $(CROSS_COMPILE)g++ LD_LTO = $(CROSS_COMPILE)ld +HOSTCC ?= gcc +HOSTCXX ?= g++ endif + CPP = $(CC) -E AR = $(CROSS_COMPILE)ar RANLIB = $(CROSS_COMPILE)ranlib -- 2.22.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
