projects
/
rustc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11f3994
)
Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE
author
Peter Michael Green
<plugwash@raspbian.org>
Thu, 22 Oct 2020 19:43:09 +0000
(19:43 +0000)
committer
Peter Michael Green
<plugwash@raspbian.org>
Thu, 22 Oct 2020 19:43:09 +0000
(19:43 +0000)
debian/architecture.mk
patch
|
blob
|
history
diff --git
a/debian/architecture.mk
b/debian/architecture.mk
index 922435459423bf3cc9d8a8542cb98ba8578716f9..fb41c65698078f7037cef6fc82f359297ea5eb8d 100644
(file)
--- a/
debian/architecture.mk
+++ b/
debian/architecture.mk
@@
-14,4
+14,4
@@
ifeq ($(DEB_TARGET_RUST_TYPE),-unknown-)
DEB_TARGET_RUST_TYPE = $(DEB_HOST_RUST_TYPE)
endif
-DEB_BUILD_RUST_TYPE = $(shell
dpkg -L rustc | grep '/usr/lib/rustlib/' | head -n 1 | cut -d '/' -f 5
)
+DEB_BUILD_RUST_TYPE = $(shell
RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])'
)