diff --git a/debian/config.toml.in b/debian/config.toml.in index c881f7bc2a..3c8c49ae48 100644 --- a/debian/config.toml.in +++ b/debian/config.toml.in @@ -1,4 +1,4 @@ -change-id = 123711 +change-id = 129295 [build] submodules = false @@ -34,26 +34,39 @@ prefix = "/usr" [target.DEB_BUILD_RUST_TYPE] llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" linker = "DEB_BUILD_GNU_TYPE-gcc" +PROFILER_PATH ifelse(DEB_BUILD_RUST_TYPE,DEB_HOST_RUST_TYPE,, [target.DEB_HOST_RUST_TYPE] llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" linker = "DEB_HOST_GNU_TYPE-gcc" +PROFILER_PATH )dnl ifelse(DEB_BUILD_RUST_TYPE,DEB_TARGET_RUST_TYPE,,DEB_HOST_RUST_TYPE,DEB_TARGET_RUST_TYPE,, [target.DEB_TARGET_RUST_TYPE] llvm-config = "LLVM_DESTDIR/usr/lib/llvm-LLVM_VERSION/bin/llvm-config" linker = "DEB_TARGET_GNU_TYPE-gcc" +PROFILER_PATH )dnl [target.wasm32-wasi] wasi-root = "/usr" +profiler = false [target.wasm32-wasip1] wasi-root = "/usr" +profiler = false [target.wasm32-wasip2] wasi-root = "/usr" +profiler = false +[target.wasm32-unknown-unknown] +profiler = false +ifelse(WINDOWS_ARCH,,, +[target.WINDOWS_ARCH-pc-windows-gnu] +profiler = false + +)dnl [llvm] link-shared = true diff --git a/debian/rules b/debian/rules index 3d5ab51416..559f6b52e7 100755 --- a/debian/rules +++ b/debian/rules @@ -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?) CLANG_RT_ARCH = PROFILER = "false" +PROFILER_PATH = "" 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_PATH = profiler = \"/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/linux/libclang_rt.profile-$(CLANG_RT_ARCH).a\" endif ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -233,6 +234,8 @@ debian/config.toml: debian/config.toml.in debian/rules -DLLVM_VERSION="$(LLVM_VERSION)" \ -DRUST_DESTDIR="$(RUST_DESTDIR)" \ -DPROFILER="$(PROFILER)" \ + -DPROFILER_PATH="$(PROFILER_PATH)" \ + -DWINDOWS_ARCH="$(WINDOWS_ARCH)" \ "$<" > "$@" if $(DOWNLOAD_BOOTSTRAP) || [ $(HAVE_BINARY_TARBALL) != 0 ]; \ then sed -i -e '/^rustc = /d' -e '/^cargo = /d' "$@"; fi