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
//\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
+#endif\r
+#ifdef __GNUC__\r
#include <sys/stat.h>\r
#endif\r
#include <string.h>\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
if (p->mtMode)\r
MatchFinderMt_ReleaseStream(&p->matchFinderMt);\r
#else\r
- pp = pp;\r
+ (void)pp;\r
#endif\r
}\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
#\r
# UNIX (default)\r
#\r
-CC=gcc\r
+CC?=gcc\r
COPT=-O\r
ANTLR=${BIN_DIR}/antlr\r
DLG=${BIN_DIR}/dlg\r