internal/rosa/cmake: use DESTDIR instead of --prefix
All checks were successful
Test / Create distribution (push) Successful in 1m4s
Test / Sandbox (push) Successful in 2m58s
Test / ShareFS (push) Successful in 3m48s
Test / Hakurei (push) Successful in 3m54s
Test / Sandbox (race detector) (push) Successful in 5m27s
Test / Hakurei (race detector) (push) Successful in 6m30s
Test / Flake checks (push) Successful in 1m21s
All checks were successful
Test / Create distribution (push) Successful in 1m4s
Test / Sandbox (push) Successful in 2m58s
Test / ShareFS (push) Successful in 3m48s
Test / Hakurei (push) Successful in 3m54s
Test / Sandbox (race detector) (push) Successful in 5m27s
Test / Hakurei (race detector) (push) Successful in 6m30s
Test / Flake checks (push) Successful in 1m21s
Turns out --prefix is deeply broken, and DESTDIR works even when using ninja. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -893,7 +893,6 @@ func main() {
|
|||||||
"with-toolchain", command.BoolFlag(false),
|
"with-toolchain", command.BoolFlag(false),
|
||||||
"Include the stage2 LLVM toolchain",
|
"Include the stage2 LLVM toolchain",
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Command(
|
c.Command(
|
||||||
|
|||||||
@@ -98,6 +98,6 @@ cmake -G ` + generate + ` \
|
|||||||
-DCMAKE_INSTALL_PREFIX=/system \
|
-DCMAKE_INSTALL_PREFIX=/system \
|
||||||
'/usr/src/` + name + `/` + filepath.Join(attr.Append...) + `'
|
'/usr/src/` + name + `/` + filepath.Join(attr.Append...) + `'
|
||||||
cmake --build . --parallel=` + jobsE + `
|
cmake --build . --parallel=` + jobsE + `
|
||||||
cmake --install . --prefix=/work/system
|
DESTDIR=/work cmake --install .
|
||||||
` + script
|
` + script
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ package spirv-llvm-translator {
|
|||||||
tag = "v"+version;
|
tag = "v"+version;
|
||||||
checksum = "JZAaV5ewYcm-35YA_U2BM2IcsQouZtX1BLZR0zh2vSlfEXMsT5OCtY4Gh5RJkcGy";
|
checksum = "JZAaV5ewYcm-35YA_U2BM2IcsQouZtX1BLZR0zh2vSlfEXMsT5OCtY4Gh5RJkcGy";
|
||||||
};
|
};
|
||||||
patches = [ "remove-early-prefix.patch" ];
|
|
||||||
|
|
||||||
// litArgs emits shell syntax
|
// litArgs emits shell syntax
|
||||||
early = "\nexport LIT_OPTS=" + litArgs {
|
early = "\nexport LIT_OPTS=" + litArgs {
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index c000a77e..f18f3fde 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -164,7 +164,7 @@ install(
|
|
||||||
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVOpts.h
|
|
||||||
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVExtensions.inc
|
|
||||||
DESTINATION
|
|
||||||
- ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
|
|
||||||
+ include/LLVMSPIRVLib
|
|
||||||
)
|
|
||||||
|
|
||||||
configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY)
|
|
||||||
@@ -172,5 +172,5 @@ install(
|
|
||||||
FILES
|
|
||||||
${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
|
|
||||||
DESTINATION
|
|
||||||
- ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
|
|
||||||
+ lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
|
|
||||||
)
|
|
||||||
;
|
|
||||||
Reference in New Issue
Block a user