Using LLVM compiler set to build BaseTools in Linux

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2842

To use LLVM to build BaseTools, first set the CLANG_BIN environment value,
and add "CXX=llvm" to choose LLVM compiler set when using make command.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 4e9b36d98bdb4dc5fd26fba637090d2c277bf1b8..1c105ee7d434f20e713476f606d92ebc6365e30e 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -38,12 +38,19 @@ endif
 CYGWIN:=$(findstring CYGWIN, $(shell uname -s))\r
 LINUX:=$(findstring Linux, $(shell uname -s))\r
 DARWIN:=$(findstring Darwin, $(shell uname -s))\r
-\r
+ifeq ($(CXX), llvm)\r
+BUILD_CC ?= $(CLANG_BIN)clang\r
+BUILD_CXX ?= $(CLANG_BIN)clang++\r
+BUILD_AS ?= $(CLANG_BIN)clang\r
+BUILD_AR ?= $(CLANG_BIN)llvm-ar\r
+BUILD_LD ?= $(CLANG_BIN)llvm-ld\r
+else\r
 BUILD_CC ?= gcc\r
 BUILD_CXX ?= g++\r
 BUILD_AS ?= gcc\r
 BUILD_AR ?= ar\r
 BUILD_LD ?= ld\r
+endif\r
 LINKER ?= $(BUILD_CC)\r
 ifeq ($(HOST_ARCH), IA32)\r
 ARCH_INCLUDE = -I $(MAKEROOT)/Include/Ia32/\r
@@ -72,14 +79,25 @@ ifeq ($(DARWIN),Darwin)
 BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \\r
 -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g\r
 else\r
+ifeq ($(CXX), llvm)\r
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \\r
+-fno-delete-null-pointer-checks -Wall -Werror \\r
+-Wno-deprecated-declarations -Wno-self-assign \\r
+-Wno-unused-result -nostdlib -g\r
+else\r
 BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \\r
 -fno-delete-null-pointer-checks -Wall -Werror \\r
 -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \\r
 -Wno-unused-result -nostdlib -g\r
 endif\r
+endif\r
+ifeq ($(CXX), llvm)\r
+BUILD_LFLAGS =\r
+BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result\r
+else\r
 BUILD_LFLAGS =\r
 BUILD_CXXFLAGS = -Wno-unused-result\r
-\r
+endif\r
 ifeq ($(HOST_ARCH), IA32)\r
 #\r
 # Snow Leopard  is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults\r

diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
index 42e3d7da020f6af08c9c160a0704dc99d3f91d7d..fc329944b992cd94ec07bd1718e6d5f80846659a 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -16,9 +16,11 @@ TOOL_INCLUDE = -I Pccts/h
 #OBJECTS = VfrSyntax.o VfrServices.o DLGLexer.o EfiVfrParser.o ATokenBuffer.o DLexerBase.o AParser.o\r
 OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyntax.o \\r
           VfrFormPkg.o VfrError.o VfrUtilityLib.o VfrCompiler.o\r
-\r
+ifeq ($(CXX), llvm)\r
+VFR_CPPFLAGS = -Wno-deprecated-register -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS)\r
+else\r
 VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS)\r
-\r
+endif\r
 # keep BUILD_OPTFLAGS last\r
 VFR_CXXFLAGS = $(BUILD_OPTFLAGS)\r
 \r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
index 8f2cc78c59475c3ba1d73723dd342f84a9631bb0..559b1c99f1efb4f407751225f7a1f451be1e45d9 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
@@ -164,7 +164,11 @@ PCCTS_H=../h
 #\r
 #   UNIX  (default)\r
 #\r
+ifeq ($(CXX), llvm)\r
+BUILD_CC?=$(CLANG_BIN)clang\r
+else\r
 BUILD_CC?=gcc\r
+endif\r
 COPT=-O\r
 ANTLR=${BIN_DIR}/antlr\r
 DLG=${BIN_DIR}/dlg\r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
index b3a34d3b46132fd62a27bd185949e51a0768d32e..5a3561edecd472f979f7f829695f01a656c163cd 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
@@ -114,7 +114,11 @@ PCCTS_H=../h
 #\r
 #   UNIX\r
 #\r
+ifeq ($(CXX), llvm)\r
+BUILD_CC?=$(CLANG_BIN)clang\r
+else\r
 BUILD_CC?=cc\r
+endif\r
 COPT=-O\r
 ANTLR=${BIN_DIR}/antlr\r
 DLG=${BIN_DIR}/dlg\r