summaryrefslogtreecommitdiffstats
path: root/BaseTools
diff options
context:
space:
mode:
authorAnderw Fish <afish@apple.com>2014-08-28 05:13:37 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-28 05:13:37 +0000
commitf7523dee90d893a7612b5eff94b2bd33b277dde2 (patch)
tree5b7f52994689f89d1f5b74bc6051e6ec1372a3a4 /BaseTools
parent4e363936ecb2e38ad4955c8d7718d2ff5204dbb0 (diff)
downloadedk2-f7523dee90d893a7612b5eff94b2bd33b277dde2.tar.gz
edk2-f7523dee90d893a7612b5eff94b2bd33b277dde2.tar.bz2
edk2-f7523dee90d893a7612b5eff94b2bd33b277dde2.zip
BaseTools: Fix BaseTools C compiler flags for Xcode 5
-fno-merge-constants is not supported by clang, and it warns it will turn into a hard error in the future. -Wno-deprecated-declarations removes warnings about obsolete libraries that are not secure. -Wno-self-assign removes warnings from LZMA code. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Anderw Fish <afish@apple.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15938 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools')
-rw-r--r--BaseTools/Source/C/Makefiles/header.makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 6895f98c6e..3049587797 100644
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -41,7 +41,7 @@ endif
INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
CPPFLAGS = $(INCLUDE)
-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fno-merge-constants -nostdlib -Wall -Werror -c -g
+CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -nostdlib -c -g
LFLAGS =
ifeq ($(ARCH), IA32)