From b4e0ff01a8da2e9d46e773c2deb556809eda0af0 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott <ian@iandouglasscott.com> Date: Tue, 13 Jun 2017 20:07:30 -0700 Subject: [PATCH] More llvm-root into build/ --- recipes/rust/llvm-config | 2 +- recipes/rust/recipe.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/rust/llvm-config b/recipes/rust/llvm-config index f2027dec9..0ac59cda3 100755 --- a/recipes/rust/llvm-config +++ b/recipes/rust/llvm-config @@ -4,7 +4,7 @@ import sys import os args = sys.argv[1:] -prefix = os.path.realpath(os.path.dirname(os.path.abspath(sys.argv[0])) + "/../llvm-root") +prefix = os.path.realpath(os.path.dirname(os.path.abspath(sys.argv[0])) + "/llvm-root") # The values here are copied from the output of llvm-config running under Redox. # This is a hack, and should be replaced if possible. diff --git a/recipes/rust/recipe.sh b/recipes/rust/recipe.sh index 39a24fa05..62b0b5b86 100644 --- a/recipes/rust/recipe.sh +++ b/recipes/rust/recipe.sh @@ -4,7 +4,7 @@ BRANCH=compile-redox ARCH=x86_64 HOST=x86_64-elf-redox RUST_HOST=x86_64-unknown-redox -LLVM_PREFIX=$PWD/llvm-root +LLVM_PREFIX=$PWD/build/llvm-root SYSROOT=/usr/x86_64-elf-redox unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP -- GitLab