proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2026-08-16 17:52:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to unbreak cross-compiling again

Browse Source
This commit is contained in:
Ximin Luo 2019-04-29 19:10:19 -07:00
parent 49b46905d2
commit ec028c2e11
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/config.toml.in vendored
View File

@ -24,15 +24,18 @@ 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"
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"
)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"
)dnl
[llvm]

7
debian/rules vendored
View File

@ -143,10 +143,13 @@ debian/config.toml: debian/config.toml.in debian/rules
u="$(DEB_VERSION_UPSTREAM)"; \
if [ "$$u" != "$${u%~beta.*+dfsg*}" ]; then channel="beta"; \
else channel="stable"; fi; echo $$channel; \
m4 -DDEB_BUILD_RUST_TYPE="$(DEB_BUILD_RUST_TYPE)" \
m4 -DRELEASE_CHANNEL="$$channel" \
-DDEB_BUILD_RUST_TYPE="$(DEB_BUILD_RUST_TYPE)" \
-DDEB_HOST_RUST_TYPE="$(DEB_HOST_RUST_TYPE)" \
-DDEB_TARGET_RUST_TYPE="$(DEB_TARGET_RUST_TYPE)" \
-DRELEASE_CHANNEL="$$channel" \
-DDEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
-DDEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
-DDEB_TARGET_GNU_TYPE="$(DEB_TARGET_GNU_TYPE)" \
-DMAKE_OPTIMISATIONS="$(MAKE_OPTIMISATIONS)" \
-DLLVM_DESTDIR="$(LLVM_DESTDIR)" \
-DLLVM_VERSION="$(LLVM_VERSION)" \