about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-07 18:17:54 -0700
committerGitHub <noreply@github.com>2016-10-07 18:17:54 -0700
commit49be16e766f76ccccbf6567038399a442de66544 (patch)
tree285b4f14eb4b8e3e028c21fc36221c6415cf42f1
parent6e8f92f11cdc713ddec4c60c66097d05c194bab2 (diff)
parent5388d3fbe8f27a5fad35315729553b4838b91746 (diff)
Auto merge of #37006 - brson:jsbackend, r=alexcrichton
Turn on JSBackend in the makefiles

This should make the nightlies work with emscripten. r? @alexcrichton

Closes #37004
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 59a3c1c828d..6cef35beb6d 100755
--- a/configure
+++ b/configure
@@ -1764,7 +1764,7 @@ do
         CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=ON"
     fi
 
-    CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;Mips;PowerPC;SystemZ'"
+    CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend'"
     CMAKE_ARGS="$CMAKE_ARGS -G '$CFG_CMAKE_GENERATOR'"
     CMAKE_ARGS="$CMAKE_ARGS $CFG_LLVM_SRC_DIR"