roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-21 07:49:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trunk' into str-split-bitcode

Browse Source
This commit is contained in:
Chadtech 2020-10-29 09:41:19 -04:00 committed by GitHub
commit aa0eff1645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/install-ci-libraries.sh
View File

@ -65,6 +65,3 @@ apt-get install -y clang-$LLVM_VERSION lldb-$LLVM_VERSION lld-$LLVM_VERSION clan
wget -c https://ziglang.org/builds/zig-linux-x86_64-0.6.0+0088efc4b.tar.xz --no-check-certificate
tar -xf zig-linux-x86_64-0.6.0+0088efc4b.tar.xz
ln -s "$PWD/zig-linux-x86_64-0.6.0+0088efc4b/zig" /usr/local/bin/zig
# symlink llvm tools
ln -s /usr/bin/llvm-as-10 /usr/local/bin/llvm-as

2
compiler/builtins/build.rs
View File

@ -62,7 +62,7 @@ fn main() {
let dest_bc = dest_bc_path.to_str().expect("Invalid dest bc path");
println!("Compiling bitcode to: {}", dest_bc);
run_command("llvm-as", &[dest_ll, "-o", dest_bc]);
run_command("llvm-as-10", &[dest_ll, "-o", dest_bc]);
println!("cargo:rerun-if-changed=build.rs");
println!("cargo:rerun-if-changed={}", src_path_str);

2
nix/bin/llvm-as-10 Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
llvm-as "$@"

5
shell.nix
View File

@ -52,5 +52,10 @@ let
in pkgs.mkShell {
buildInputs = inputs ++ darwin-frameworks;
LLVM_SYS_100_PREFIX = "${llvm}";
# Aliases don't work cross shell, so we do this
shellHook = ''
export PATH="$PATH:$PWD/nix/bin"
'';
}