summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2011-11-28 00:48:58 +0000
committerDylan Noblesmith <nobled@dreamwidth.org>2011-11-28 00:48:58 +0000
commit08b73a30bbb6407c7b48a734a29f65f4c8ddd782 (patch)
tree040bff3119ed96aea1eede023bdf4cfed7d70c68 /cmake
parent81818fc770bde5e279a1990f269b80da3219907c (diff)
downloadllvm-08b73a30bbb6407c7b48a734a29f65f4c8ddd782.tar.gz
llvm-08b73a30bbb6407c7b48a734a29f65f4c8ddd782.tar.bz2
llvm-08b73a30bbb6407c7b48a734a29f65f4c8ddd782.tar.xz
rename ENABLE_THREADS to LLVM_ENABLE_THREADS
Now that it needs to be exported in a public header (Valgrind.h) it should be prefixed to avoid collision with other projects. Add it to llvm-config.h as well. This'll require regenerating the configure script after this commit, but I don't have the required autoconf version. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145214 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rwxr-xr-xcmake/config-ix.cmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 0943ae71b8..a5077002fe 100755
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -379,14 +379,15 @@ endif( PURE_WINDOWS )
set(RETSIGTYPE void)
if( LLVM_ENABLE_THREADS )
- if( HAVE_PTHREAD_H OR WIN32 )
- set(ENABLE_THREADS 1)
+ # Check if threading primitives aren't supported on this platform
+ if( NOT HAVE_PTHREAD_H AND NOT WIN32 )
+ set(LLVM_ENABLE_THREADS 0)
endif()
endif()
-if( ENABLE_THREADS )
+if( LLVM_ENABLE_THREADS )
message(STATUS "Threads enabled.")
-else( ENABLE_THREADS )
+else( LLVM_ENABLE_THREADS )
message(STATUS "Threads disabled.")
endif()