diff options
| author | Julien Lerouge <jlerouge@apple.com> | 2009-10-26 20:01:35 +0000 |
|---|---|---|
| committer | Julien Lerouge <jlerouge@apple.com> | 2009-10-26 20:01:35 +0000 |
| commit | d0c160e36c701af02f7bea8ec677ece6426fc559 (patch) | |
| tree | 46ca1e52ff27ca41892d4e5a3e6ae2933e82baa9 | |
| parent | b614dd3fcbe9872d5549a660ec45084bc9944c34 (diff) | |
| download | bcm5719-llvm-d0c160e36c701af02f7bea8ec677ece6426fc559.tar.gz bcm5719-llvm-d0c160e36c701af02f7bea8ec677ece6426fc559.zip | |
Remove / use flags that are now set in the Makefile.config.
llvm-svn: 85149
| -rw-r--r-- | llvm/unittests/Makefile.unittest | 2 | ||||
| -rw-r--r-- | llvm/utils/unittest/UnitTestMain/Makefile | 2 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/Makefile | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/llvm/unittests/Makefile.unittest b/llvm/unittests/Makefile.unittest index 76051e497c9..e4174355ed7 100644 --- a/llvm/unittests/Makefile.unittest +++ b/llvm/unittests/Makefile.unittest @@ -19,7 +19,7 @@ include $(LEVEL)/Makefile.common LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT) CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ -CPP.Flags += -Wno-variadic-macros +CPP.Flags += $(NO_VARIADIC_MACROS) TESTLIBS = -lGoogleTest -lUnitTestMain $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) diff --git a/llvm/utils/unittest/UnitTestMain/Makefile b/llvm/utils/unittest/UnitTestMain/Makefile index aadff217aad..7b49191fd6f 100644 --- a/llvm/utils/unittest/UnitTestMain/Makefile +++ b/llvm/utils/unittest/UnitTestMain/Makefile @@ -10,8 +10,6 @@ LEVEL = ../../.. include $(LEVEL)/Makefile.config -NO_MISSING_FIELD_INITIALIZERS := $(shell $(CXX) -Wno-missing-field-initializers -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-missing-field-initializers) -NO_VARIADIC_MACROS := $(shell $(CXX) -Wno-variadic-macros -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-variadic-macros) LIBRARYNAME = UnitTestMain BUILD_ARCHIVE = 1 diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index 29fe679a9b3..2d2c2829766 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -10,8 +10,6 @@ LEVEL := ../../.. include $(LEVEL)/Makefile.config -NO_MISSING_FIELD_INITIALIZERS := $(shell $(CXX) -Wno-missing-field-initializers -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-missing-field-initializers) -NO_VARIADIC_MACROS := $(shell $(CXX) -Wno-variadic-macros -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-variadic-macros) LIBRARYNAME = GoogleTest BUILD_ARCHIVE = 1 |
