about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-11-09 10:32:24 +0100
committerNikita Popov <nikita.ppv@gmail.com>2018-11-09 16:59:45 +0100
commit82574e9ec804b6efbf6dfcf523d32618528ee32b (patch)
treeac1ea32c1eefd1f556a91400743ba3898dd067db
parentb1a33971ab09233c182eb453b9f7812550b3b794 (diff)
Pull in fix for dist-i686-linux build
-rw-r--r--.gitmodules2
m---------src/llvm-emscripten0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 6274efaec6c..bf9bdd9a5b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,7 +43,7 @@
 	url = https://github.com/rust-lang/rust-by-example.git
 [submodule "src/llvm-emscripten"]
 	path = src/llvm-emscripten
-	url = https://github.com/kripken/emscripten-fastcomp
+	url = https://github.com/rust-lang/llvm.git
 [submodule "src/stdsimd"]
 	path = src/stdsimd
 	url = https://github.com/rust-lang-nursery/stdsimd.git
diff --git a/src/llvm-emscripten b/src/llvm-emscripten
-Subproject 272d3ff91b38eac051bdbaf6cf84db5c901ce2f
+Subproject 7f23313edff8beccb3fe44b815714269c5124c1