BaseTools: Fix build on FreeBSD and allow use of non-gcc system compiler

On FreeBSD, uuid.h is in /usr/include, not /usr/include/uuid.

Fix some errors when building using clang caused by self-assignment: the
preferred way to 'use' a variable is '(void)x;', not 'x = x;'.

Where the system provides $(CC) etc. by default, don't override it to be gcc.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bruce Cran <bruce@cran.org.uk>
Reviewed-by: Yingke Liu <yingke.d.liu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17866 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index ed9d496b7b8a6461cae46cf39af9deeec0956d86..005098508b26023c14e0fa5b9dba306d3a9321c6 100644 (file)
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -16,8 +16,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Include files\r
 //\r
 //\r
 // Include files\r
 //\r

-#ifdef __GNUC__\r
+\r
+#if defined(__FreeBSD__)\r
+#include <uuid.h>\r
+#elif defined(__GNUC__)\r

 #include <uuid/uuid.h>\r
 #include <uuid/uuid.h>\r

+#endif\r
+#ifdef __GNUC__\r

 #include <sys/stat.h>\r
 #endif\r
 #include <string.h>\r
 #include <sys/stat.h>\r
 #endif\r
 #include <string.h>\r

diff --git a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
index b569b4e4d9804a808bcf6b0034e42c00ec9d654a..1de07a35411ad1bdea5d7ce5241e21747d117b2f 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
+++ b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
@@ -43,8 +43,8 @@ const char *kCantWriteMessage = "Can not write output file";
 const char *kCantAllocateMessage = "Can not allocate memory";\r
 const char *kDataErrorMessage = "Data error";\r
 \r
 const char *kCantAllocateMessage = "Can not allocate memory";\r
 const char *kDataErrorMessage = "Data error";\r
 \r

-static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }\r
-static void SzFree(void *p, void *address) { p = p; MyFree(address); }\r
+static void *SzAlloc(void *p, size_t size) { (void)p; return MyAlloc(size); }\r
+static void SzFree(void *p, void *address) { (void)p; MyFree(address); }\r

 static ISzAlloc g_Alloc = { SzAlloc, SzFree };\r
 \r
 static Bool mQuietMode = False;\r
 static ISzAlloc g_Alloc = { SzAlloc, SzFree };\r
 \r
 static Bool mQuietMode = False;\r

diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
index 72722727846f7b4ea55b08fb6ef53a566000ff2b..95c3c9ff5fc7c187623602a87d8eec8d6db3c2ab 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
@@ -2112,7 +2112,7 @@ void LzmaEnc_Finish(CLzmaEncHandle pp)
   if (p->mtMode)\r
     MatchFinderMt_ReleaseStream(&p->matchFinderMt);\r
   #else\r
   if (p->mtMode)\r
     MatchFinderMt_ReleaseStream(&p->matchFinderMt);\r
   #else\r

-  pp = pp;\r
+  (void)pp;\r

   #endif\r
 }\r
 \r
   #endif\r
 }\r
 \r

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 6a759d94c7a6c04950ec670d2436b286b8825591..09d2bff0e03584279f917e61c6ea10831bff0add 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -21,11 +21,11 @@ CYGWIN:=$(findstring CYGWIN, $(shell uname -s))
 LINUX:=$(findstring Linux, $(shell uname -s))\r
 DARWIN:=$(findstring Darwin, $(shell uname -s))\r
 \r
 LINUX:=$(findstring Linux, $(shell uname -s))\r
 DARWIN:=$(findstring Darwin, $(shell uname -s))\r
 \r

-CC = gcc\r
-CXX = g++\r
-AS = gcc\r
-AR = ar\r
-LD = ld\r
+CC ?= gcc\r
+CXX ?= g++\r
+AS ?= gcc\r
+AR ?= ar\r
+LD ?= ld\r

 LINKER ?= $(CC)\r
 ifeq ($(ARCH), IA32)\r
 ARCH_INCLUDE = -I $(MAKEROOT)/Include/Ia32/\r
 LINKER ?= $(CC)\r
 ifeq ($(ARCH), IA32)\r
 ARCH_INCLUDE = -I $(MAKEROOT)/Include/Ia32/\r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
index 478a3a1ccf065d378057572a1566349ee0679a2e..c49cfd8fb2ec9e4bfc2739d96984f7cfb59bcfc6 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
@@ -164,7 +164,7 @@ PCCTS_H=../h
 #\r
 #   UNIX  (default)\r
 #\r
 #\r
 #   UNIX  (default)\r
 #\r

-CC=gcc\r
+CC?=gcc\r

 COPT=-O\r
 ANTLR=${BIN_DIR}/antlr\r
 DLG=${BIN_DIR}/dlg\r
 COPT=-O\r
 ANTLR=${BIN_DIR}/antlr\r
 DLG=${BIN_DIR}/dlg\r