Merge pull request #7 from getditto/tk/llvm-cmdline

Problem: App Store rejects app containing Rust with bitcode error

Author: thombles

build.sh

@@ -38,6 +38,7 @@ cd rust
 git reset --hard
 git clean -f
 git checkout "$RUST_BRANCH"
+git apply ../../patches/rust_embed_cmdline.diff
 cd ..
 mkdir -p rust-build
 cd rust-build

config.sh

@@ -15,4 +15,5 @@ RUST_BRANCH="tags/1.40.0"
 # 3. Select a name for the toolchain you want to install as. The toolchain will be installed
 # under $HOME/.rust-ios-arm64/toolchain-$RUST_TOOLCHAIN
 
-RUST_TOOLCHAIN="1.40.0"
+RUST_TOOLCHAIN="1.40.0"
+

patches/rust_embed_cmdline.diff

@@ -0,0 +1,15 @@
+diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs
+index 52f3a1cbb5c..6014a1d8ade 100644
+--- a/src/librustc_codegen_llvm/back/write.rs
++++ b/src/librustc_codegen_llvm/back/write.rs
+@@ -686,7 +686,9 @@ unsafe fn embed_bitcode(cgcx: &CodegenContext<LlvmCodegenBackend>,
+     llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage);
+     llvm::LLVMSetGlobalConstant(llglobal, llvm::True);
+ 
+-    let llconst = common::bytes_in_context(llcx, &[]);
++    let args = "-triple\0arm64-apple-ios11.0.0\0-emit-obj\0\
++        -disable-llvm-passes\0-target-abi\0darwinpcs\0-Os\0";
++    let llconst = common::bytes_in_context(llcx, args.as_bytes());
+     let llglobal = llvm::LLVMAddGlobal(
+         llmod,
+         common::val_ty(llconst),