Fix building and running the llvm tests (#20101)

via make -C deps check-llvm
JuliaLang · Jan 20, 2017 · 5fa3e5d · 5fa3e5d
1 parent 79d564e
commit 5fa3e5d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -557,7 +557,7 @@ ifeq ($(OS),$(BUILD_OS))
 	cd $(LLVM_BUILDDIR_withtype) && \
 		export PATH=$(llvm_python_workaround):$$PATH && \
 		$(if $(filter $(LLVM_USE_CMAKE),1), \
-		  $(CMAKE) --build . check, \
+		  $(CMAKE) --build . --target check, \
 		  $(MAKE) $(LLVM_MFLAGS) check)
 endif
 	echo 1 > $@

diff --git a/deps/patches/llvm-3.9.0_threads.patch b/deps/patches/llvm-3.9.0_threads.patch
@@ -5524,3 +5524,22 @@ index 55b0370..c869a73 100644
 -  }
 +  return 0;
  }
+diff --git a/unittests/Support/ThreadPool.cpp b/unittests/Support/ThreadPool.cpp
+index 69a24bc..b185859 100644
+--- a/unittests/Support/ThreadPool.cpp
++++ b/unittests/Support/ThreadPool.cpp
+@@ -7,6 +7,8 @@
+ //
+ //===----------------------------------------------------------------------===//
+
++#if 0
++
+ #include "llvm/Support/ThreadPool.h"
+
+ #include "llvm/ADT/STLExtras.h"
+@@ -166,3 +168,5 @@ TEST_F(ThreadPoolTest, PoolDestruction) {
+   }
+   ASSERT_EQ(5, checked_in);
+ }
++
++#endif