aboutsummaryrefslogtreecommitdiff
path: root/lib/ExecutionEngine
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2012-05-15 22:06:08 +0000
committerBill Wendling <isanbard@gmail.com>2012-05-15 22:06:08 +0000
commit02b87df98afb03136a1f5076c042696c98524947 (patch)
treedd6b1cb579d7aea00b3997034abb9d4a1ce69fec /lib/ExecutionEngine
parent1f3405800a99939005fd5d27b712e08ecceb5975 (diff)
Merge in 156319 156837 156838.release_31
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_31@156863 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine')
-rw-r--r--lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt2
-rw-r--r--lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt b/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
index 80d2273264..9c06fdae86 100644
--- a/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
+++ b/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
@@ -18,6 +18,6 @@
[common]
[component_0]
-type = Library
+type = OptionalLibrary
name = IntelJITEvents
parent = ExecutionEngine
diff --git a/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt b/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt
index 4516dfa2da..e30516eb3b 100644
--- a/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt
+++ b/lib/ExecutionEngine/OProfileJIT/LLVMBuild.txt
@@ -18,6 +18,6 @@
[common]
[component_0]
-type = Library
+type = OptionalLibrary
name = OProfileJIT
parent = ExecutionEngine