proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2025-08-14 14:14:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set LLVM profiler RT path via config

Browse Source 
instead of via the environment, adapting to corresponding upstream changes, and
adapt the config change-id accordingly.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2024-10-18 13:13:38 +02:00
parent 482d9ff8f3
commit c68811964a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian/config.toml.in vendored
View File

@ -1,4 +1,4 @@
change-id = 123711 change-id = 129295
[build] [build]
submodules = false submodules = false
@ -34,26 +34,39 @@ prefix = "/usr"
[target.DEB_BUILD_RUST_TYPE] [target.DEB_BUILD_RUST_TYPE]
llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
linker = "DEB_BUILD_GNU_TYPE-gcc" linker = "DEB_BUILD_GNU_TYPE-gcc"
PROFILER_PATH
ifelse(DEB_BUILD_RUST_TYPE,DEB_HOST_RUST_TYPE,, ifelse(DEB_BUILD_RUST_TYPE,DEB_HOST_RUST_TYPE,,
[target.DEB_HOST_RUST_TYPE] [target.DEB_HOST_RUST_TYPE]
llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
linker = "DEB_HOST_GNU_TYPE-gcc" linker = "DEB_HOST_GNU_TYPE-gcc"
PROFILER_PATH
)dnl )dnl
ifelse(DEB_BUILD_RUST_TYPE,DEB_TARGET_RUST_TYPE,,DEB_HOST_RUST_TYPE,DEB_TARGET_RUST_TYPE,, ifelse(DEB_BUILD_RUST_TYPE,DEB_TARGET_RUST_TYPE,,DEB_HOST_RUST_TYPE,DEB_TARGET_RUST_TYPE,,
[target.DEB_TARGET_RUST_TYPE] [target.DEB_TARGET_RUST_TYPE]
llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config"
linker = "DEB_TARGET_GNU_TYPE-gcc" linker = "DEB_TARGET_GNU_TYPE-gcc"
PROFILER_PATH
)dnl )dnl
[target.wasm32-wasi] [target.wasm32-wasi]
wasi-root = "/usr" wasi-root = "/usr"
profiler = false
[target.wasm32-wasip1] [target.wasm32-wasip1]
wasi-root = "/usr" wasi-root = "/usr"
profiler = false
[target.wasm32-wasip2] [target.wasm32-wasip2]
wasi-root = "/usr" wasi-root = "/usr"
profiler = false
[target.wasm32-unknown-unknown]
profiler = false
ifelse(WINDOWS_ARCH,,,
[target.WINDOWS_ARCH-pc-windows-gnu]
profiler = false
)dnl
[llvm] [llvm]
link-shared = true link-shared = true

5
debian/rules vendored
View File

@ -59,9 +59,10 @@ ifneq (,$(filter $(DEB_TARGET_ARCH),sparc64 mips64el hurd-i386 hurd-amd64))
# mips64el: has profiler, but buggy atm (32-bit overflow in some counter?) # mips64el: has profiler, but buggy atm (32-bit overflow in some counter?)
CLANG_RT_ARCH = CLANG_RT_ARCH =
PROFILER = "false" PROFILER = "false"
PROFILER_PATH = ""
else else
export LLVM_PROFILER_RT_LIB=/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/linux/libclang_rt.profile-$(CLANG_RT_ARCH).a
PROFILER = "true" PROFILER = "true"
PROFILER_PATH = profiler = \"/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/linux/libclang_rt.profile-$(CLANG_RT_ARCH).a\"
endif endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@ -233,6 +234,8 @@ debian/config.toml: debian/config.toml.in debian/rules
-DLLVM_VERSION="$(LLVM_VERSION)" \ -DLLVM_VERSION="$(LLVM_VERSION)" \
-DRUST_DESTDIR="$(RUST_DESTDIR)" \ -DRUST_DESTDIR="$(RUST_DESTDIR)" \
-DPROFILER="$(PROFILER)" \ -DPROFILER="$(PROFILER)" \
-DPROFILER_PATH="$(PROFILER_PATH)" \
-DWINDOWS_ARCH="$(WINDOWS_ARCH)" \
"$<" > "$@" "$<" > "$@"
if $(DOWNLOAD_BOOTSTRAP) || [ $(HAVE_BINARY_TARBALL) != 0 ]; \ if $(DOWNLOAD_BOOTSTRAP) || [ $(HAVE_BINARY_TARBALL) != 0 ]; \
then sed -i -e '/^rustc = /d' -e '/^cargo = /d' "$@"; fi then sed -i -e '/^rustc = /d' -e '/^cargo = /d' "$@"; fi