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 | f974aca5c3b657b93fd45aead3fba00100652b23 (patch) | |
| tree | 68959890b82fd0e1a66e382ff616a8acc6a36361 | |
| parent | c3f1ce99a96866828eaeb5f97bf4f423db2a553e (diff) | |
| download | external_llvm-f974aca5c3b657b93fd45aead3fba00100652b23.zip external_llvm-f974aca5c3b657b93fd45aead3fba00100652b23.tar.gz external_llvm-f974aca5c3b657b93fd45aead3fba00100652b23.tar.bz2 | |
Remove / use flags that are now set in the Makefile.config.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85149 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | unittests/Makefile.unittest | 2 | ||||
| -rw-r--r-- | utils/unittest/UnitTestMain/Makefile | 2 | ||||
| -rw-r--r-- | utils/unittest/googletest/Makefile | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 76051e4..e417435 100644 --- a/unittests/Makefile.unittest +++ b/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/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile index aadff21..7b49191 100644 --- a/utils/unittest/UnitTestMain/Makefile +++ b/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/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile index 29fe679..2d2c282 100644 --- a/utils/unittest/googletest/Makefile +++ b/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 |