From a41f930411b8b5e114f0a420de6fb6d8b75d120f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 18 Apr 2019 20:57:03 -0600
Subject: [PATCH] Update to use llvm-project
---
recipes/llvm/recipe.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes/llvm/recipe.sh b/recipes/llvm/recipe.sh
index 286b0d787..f84ffaf3e 100644
--- a/recipes/llvm/recipe.sh
+++ b/recipes/llvm/recipe.sh
@@ -1,5 +1,5 @@
-GIT=https://gitlab.redox-os.org/redox-os/llvm.git
-GIT_UPSTREAM=https://github.com/rust-lang/llvm.git
+GIT=https://gitlab.redox-os.org/redox-os/llvm-project.git
+GIT_UPSTREAM=https://github.com/rust-lang/llvm-project.git
BRANCH=redox
function recipe_version {
@@ -19,7 +19,7 @@ function recipe_prepare {
function recipe_build {
native="$(realpath ../native.cmake)"
- source="$(realpath ../source)"
+ source="$(realpath ../source/llvm)"
sysroot="$(realpath ../sysroot)"
CMAKE_ARGS=(
-DCMAKE_AR="$(which "${AR}")"
@@ -60,8 +60,10 @@ function recipe_build {
-I"$sysroot/include"
-Wno-dev
)
+ set -x
cmake "${CMAKE_ARGS[@]}" "$source"
make -j$(nproc)
+ set +x
skip=1
}
--
GitLab