Support correct build:

1. Capture the ENABLE_THREADS configure variable in Makefile.config
2. Use ENABLE_THREADS to avoid building ParallelJIT if threads are not
   present.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28609 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.config.in b/Makefile.config.in
index 47d0d81cbf1d8a5276d8e8f0eab0d123b5433d12..03d62903375a0a5e066435019813524dbeb10123 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -201,6 +201,9 @@ OBJ_ROOT := .
 # When ENABLE_DOXYGEN is enabled, the doxygen documentation will be built
 ENABLE_DOXYGEN = @ENABLE_DOXYGEN@
 
+# Do we want to enable threads?
+ENABLE_THREADS := @ENABLE_THREADS@
+
 # This option tells the Makefiles to produce verbose output.
 # It essentially prints the commands that make is executing
 #VERBOSE = 1

diff --git a/examples/Makefile b/examples/Makefile
index d71651deda4658ec7474f9362b2de3fb97af003c..a6530ee6f5ab1cea3c1d2d30738da0f728f76c90 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -10,7 +10,10 @@ LEVEL=..
 
 include $(LEVEL)/Makefile.config
 
-#PARALLEL_DIRS:= $(patsubst %/Makefile,%,$(wildcard $(SourceDir)/*/Makefile))
-PARALLEL_DIRS:= ParallelJIT Fibonacci HowToUseJIT ModuleMaker BFtoLLVM
+PARALLEL_DIRS:= Fibonacci HowToUseJIT ModuleMaker BFtoLLVM
+
+ifeq ($(ENABLE_THREADS),1)
+PARALLEL_DIRS += ParallelJIT 
+endif
 
 include $(LEVEL)/Makefile.common