From 9778d5c0b4c27e885516002193666df5ced2c217 Mon Sep 17 00:00:00 2001 From: David Greene Date: Fri, 18 Jan 2013 23:22:52 +0000 Subject: Pass NO_MISSING_FIELD_INITIALIZERS to Compiler Flags configure checks whether -Wno-missing-field-initializers is a valid compiler flag but it was never actually used in Makefile.rules. Enable it to avoid some ridiculous warnings from gcc. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172870 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 59bab8fcff..2a0f1dc1c7 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -669,7 +669,8 @@ CompileCommonOpts += -pedantic -Wno-long-long endif CompileCommonOpts += -Wall -W -Wno-unused-parameter -Wwrite-strings \ $(EXTRA_OPTIONS) $(COVERED_SWITCH_DEFAULT) \ - $(NO_UNINITIALIZED) $(NO_MAYBE_UNINITIALIZED) + $(NO_UNINITIALIZED) $(NO_MAYBE_UNINITIALIZED) \ + $(NO_MISSING_FIELD_INITIALIZERS) # Enable cast-qual for C++; the workaround is to use const_cast. CXX.Flags += -Wcast-qual -- cgit v1.2.3-18-g5258 From 3ef8b0adb4c64b5a8611472850b4991afaf289f1 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 30 Jan 2013 04:07:37 +0000 Subject: build: add --with-python option This adds a new --with-python option to allow configuration of the python binary for building. If not specified, $PATH will be searched for common python binary names (python, python2, python3). If specified, and the path is not executable, it will attempt to search $PATH. Signed-off-by: Saleem Abdulrasool Reviewed-by: Eric Christopher , Daniel Dunbar git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173890 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 2a0f1dc1c7..1e64600941 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -97,7 +97,7 @@ endif $(LLVMBuildMakeFrag): $(PROJ_SRC_ROOT)/Makefile.rules \ $(PROJ_OBJ_ROOT)/Makefile.config $(Echo) Constructing LLVMBuild project information. - $(Verb) $(LLVMBuildTool) \ + $(Verb)$(PYTHON) $(LLVMBuildTool) \ --native-target "$(TARGET_NATIVE_ARCH)" \ --enable-targets "$(TARGETS_TO_BUILD)" \ --enable-optional-components "$(OPTIONAL_COMPONENTS)" \ @@ -826,7 +826,7 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) #---------------------------------------------------------- ifeq (-mingw32,$(findstring -mingw32,$(BUILD_TRIPLE))) - ECHOPATH := $(Verb)python -u -c "import sys;print ' '.join(sys.argv[1:])" + ECHOPATH := $(Verb)$(PYTHON) -u -c "import sys;print ' '.join(sys.argv[1:])" else ECHOPATH := $(Verb)$(ECHO) endif -- cgit v1.2.3-18-g5258 From 1983f54daebc5b4ba0ebb3fbc6ec0abb083f8908 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 31 Jan 2013 22:19:12 +0000 Subject: Add -Wno-nested-anon-types to -pedantic builds of LLVM. This Clang warning catches uses of an extremely minor and widely-available C++ extension (which every C++ compiler I could find supports, but EDG and Clang reject in strict mode). The diagnosed code pattern looks like this: struct X { union { struct { int a; int b; } S; }; }; git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174103 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 1e64600941..6abd3934c7 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -665,7 +665,7 @@ LD.Flags += $(EXTRA_LD_OPTIONS) endif ifndef NO_PEDANTIC -CompileCommonOpts += -pedantic -Wno-long-long +CompileCommonOpts += -pedantic -Wno-long-long $(NO_NESTED_ANON_TYPES) endif CompileCommonOpts += -Wall -W -Wno-unused-parameter -Wwrite-strings \ $(EXTRA_OPTIONS) $(COVERED_SWITCH_DEFAULT) \ -- cgit v1.2.3-18-g5258 From cdb0a58f88c7e17620286b78390d56597ef01dda Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Tue, 5 Feb 2013 17:29:03 +0000 Subject: Set the deployment target for Apple llvmCore builds. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174397 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 6abd3934c7..2f566eeb92 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -583,16 +583,24 @@ ifeq ($(HOST_OS),Darwin) LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress SharedLinkOptions := -dynamiclib - ifneq ($(ARCH),ARM) - SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION) + ifdef DEPLOYMENT_TARGET + SharedLinkOptions += $(DEPLOYMENT_TARGET) + else + ifneq ($(ARCH),ARM) + SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION) + endif endif else SharedLinkOptions=-shared endif ifeq ($(TARGET_OS),Darwin) - ifneq ($(ARCH),ARM) - TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION) + ifdef DEPLOYMENT_TARGET + TargetCommonOpts += $(DEPLOYMENT_TARGET) + else + ifneq ($(ARCH),ARM) + TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION) + endif endif endif -- cgit v1.2.3-18-g5258 From ee740ddf9d8248e39032567dc22766b0f8b45cd6 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 13 Feb 2013 19:44:08 +0000 Subject: Use 'RC_XBS' instead of 'RC_BUILDIT' to catch all times when it's built in the Apple way. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175069 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index 2f566eeb92..c737965d09 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -656,7 +656,7 @@ else ifneq ($(DARWIN_MAJVERS),4) LD.Flags += $(RPATH) -Wl,@executable_path/../lib endif - ifeq ($(RC_BUILDIT),YES) + ifeq ($(RC_XBS),YES) TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile) endif -- cgit v1.2.3-18-g5258