diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2009-07-27 09:39:18 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2009-07-27 09:39:18 +0000 |
commit | b0d3f25b77a240c83acc012b11f308be0945aa43 (patch) | |
tree | 5c04f810f578bcc0c20e81edd08423748e09a9e4 | |
parent | 30d3b911c97b28ddeda6aba15128cab55cd2cfb2 (diff) |
Remove trailing slashes from include paths. Some versions of mingw don't like them.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77188 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | unittests/Makefile | 2 | ||||
-rw-r--r-- | utils/unittest/googletest/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unittests/Makefile b/unittests/Makefile index 1eb69abbc8..53c02a8122 100644 --- a/unittests/Makefile +++ b/unittests/Makefile @@ -13,7 +13,7 @@ include $(LEVEL)/Makefile.config LIBRARYNAME = UnitTestMain BUILD_ARCHIVE = 1 -CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ +CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += -Wno-variadic-macros PARALLEL_DIRS = ADT ExecutionEngine Support VMCore MC diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile index d709878449..8366055944 100644 --- a/utils/unittest/googletest/Makefile +++ b/utils/unittest/googletest/Makefile @@ -15,7 +15,7 @@ NO_VARIADIC_MACROS := $(shell $(CXX) -Wno-variadic-macros -fsyntax-only -xc /dev LIBRARYNAME = GoogleTest BUILD_ARCHIVE = 1 -CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ +CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) ifeq ($(OS),MingW) |