summaryrefslogtreecommitdiffstats
path: root/UnixPkg
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-03-08 00:12:30 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-03-08 00:12:30 +0000
commit2d7df6428ccf9da444234d3f7da11d049e7b9884 (patch)
tree024279617f7625ef81b3e365f4641e4fbafb1706 /UnixPkg
parenta1fe1d6dd87986175207c62992ef956d518b8163 (diff)
downloadedk2-2d7df6428ccf9da444234d3f7da11d049e7b9884.tar.gz
edk2-2d7df6428ccf9da444234d3f7da11d049e7b9884.tar.bz2
edk2-2d7df6428ccf9da444234d3f7da11d049e7b9884.zip
Fix up the UnixPkg to work with clang on OS X. XCLANG toolchain configuration has already been checked into BaseTools project.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11350 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UnixPkg')
-rw-r--r--UnixPkg/Sec/SecMain.c2
-rw-r--r--UnixPkg/UnixGopDxe/UnixGopScreen.c2
-rw-r--r--UnixPkg/UnixPkg.dsc2
-rw-r--r--UnixPkg/UnixPkgX64.dsc6
-rwxr-xr-xUnixPkg/build64.sh2
5 files changed, 10 insertions, 4 deletions
diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index a82ec1cce1..d292abe951 100644
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -1012,7 +1012,7 @@ Returns:
Array = mImageContextModHandleArray;
for (Index = 0; Index < mImageContextModHandleArraySize; Index++, Array++) {
- if ((Array->ImageContext == ImageContext)) {
+ if (Array->ImageContext == ImageContext) {
//
// If you find a match return it and delete the entry
//
diff --git a/UnixPkg/UnixGopDxe/UnixGopScreen.c b/UnixPkg/UnixGopDxe/UnixGopScreen.c
index a9460a1065..ed2a3e7942 100644
--- a/UnixPkg/UnixGopDxe/UnixGopScreen.c
+++ b/UnixPkg/UnixGopDxe/UnixGopScreen.c
@@ -217,7 +217,7 @@ UnixGopBlt (
Status = Private->UgaIo->UgaBlt (
Private->UgaIo,
(EFI_UGA_PIXEL *)BltBuffer,
- BltOperation,
+ (EFI_UGA_BLT_OPERATION)BltOperation,
&GopBltArgs
);
diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index c9fd223e35..0eef2b3724 100644
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -206,7 +206,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"Setup"|gEfiUnixSystemConfigGuid|0x0|80
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEfiUnixSystemConfigGuid|0x4|25
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
-
+
###################################################################################################
#
# Components Section - list of the modules and components that will be processed by compilation
diff --git a/UnixPkg/UnixPkgX64.dsc b/UnixPkg/UnixPkgX64.dsc
index 1eae7f9ecb..466339cff1 100644
--- a/UnixPkg/UnixPkgX64.dsc
+++ b/UnixPkg/UnixPkgX64.dsc
@@ -208,6 +208,12 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEfiUnixSystemConfigGuid|0x4|25
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
+[BuildOptions]
+ # Magic to make system include files work
+ XCODE:*_XCLANG_*_CC_FLAGS = -U __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ -D __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1060 -D __APPLE__ -I/System/Library/Frameworks -I/Library/Frameworks
+ XCODE:*_XCLANG_*_PP_FLAGS = -U __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ -D __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1060 -D __APPLE__ -I/System/Library/Frameworks -I/Library/Frameworks
+
+
###################################################################################################
#
# Components Section - list of the modules and components that will be processed by compilation
diff --git a/UnixPkg/build64.sh b/UnixPkg/build64.sh
index 22e9c08ead..e524faf293 100755
--- a/UnixPkg/build64.sh
+++ b/UnixPkg/build64.sh
@@ -53,7 +53,7 @@ case `uname` in
exit 1
else
TARGET_TOOLS=XCODE32
- UNIXPKG_TOOLS=UNIXPKG
+ UNIXPKG_TOOLS=XCLANG
fi
NETWORK_SUPPORT="-D NETWORK_SUPPORT"
;;