Skip to content
Snippets Groups Projects
Verified Commit 59779a57 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fixes for installing rust package

parent 103c51c3
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,9 @@ submodules = false ...@@ -9,6 +9,9 @@ submodules = false
tools = ["src"] tools = ["src"]
verbose = 1 verbose = 1
[install]
prefix = "install"
[rust] [rust]
backtrace = false backtrace = false
rpath = false rpath = false
......
...@@ -18,7 +18,7 @@ function recipe_build { ...@@ -18,7 +18,7 @@ function recipe_build {
config="$(realpath ../config.toml)" config="$(realpath ../config.toml)"
source="$(realpath ../source)" source="$(realpath ../source)"
unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP
python3 "$source/x.py" dist --config "$config" --jobs $(nproc) --incremental python3 "$source/x.py" install --config "$config" --jobs $(nproc) --incremental
skip=1 skip=1
} }
...@@ -33,10 +33,8 @@ function recipe_clean { ...@@ -33,10 +33,8 @@ function recipe_clean {
} }
function recipe_stage { function recipe_stage {
binpath="$1/bin" rsync -av --delete "install/" "$1/"
libpath="$1/lib" # Cannot use STRIP because it is unset in recipe_build
cp -frv "build/${TARGET}/stage2/bin" "$binpath" "${HOST}-strip" -v "$1/bin/"{rustc,rustdoc}
cp -frv "build/${TARGET}/stage2/lib" "$libpath"
${STRIP} "$binpath/"*
skip=1 skip=1
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment