diff options
| author | Bruce Cran <bruce@cran.org.uk> | 2015-07-08 01:06:25 +0000 |
|---|---|---|
| committer | yingke <yingke@Edk2> | 2015-07-08 01:06:25 +0000 |
| commit | 5ddccf34c4f57e6e7fca767c1628a0d98ce8bdaf (patch) | |
| tree | 1f14236972c9e584140158b471c6b311c4dec7c1 /BaseTools/Source/C/GenFv | |
| parent | e109e3fec9245e3fa777802d17e00431e349a6bd (diff) | |
| download | edk2-platforms-5ddccf34c4f57e6e7fca767c1628a0d98ce8bdaf.tar.xz | |
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
Diffstat (limited to 'BaseTools/Source/C/GenFv')
| -rw-r--r-- | BaseTools/Source/C/GenFv/GenFvInternalLib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index ed9d496b7b..005098508b 100644 --- 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. //
// Include files
//
-#ifdef __GNUC__
+
+#if defined(__FreeBSD__)
+#include <uuid.h>
+#elif defined(__GNUC__)
#include <uuid/uuid.h>
+#endif
+#ifdef __GNUC__
#include <sys/stat.h>
#endif
#include <string.h>
|