Skip to content

Commit 0a20ec3

Browse files
author
Jonathan Turner
authored
Rollup merge of rust-lang#37482 - matwey:configure-arm, r=alexcrichton
Misc fixes for configure Currently, `./configure` at armv6 machines ends up with ``` configure: error: unknown CPU type: armv6l ``` `./configure` at armv7 machines **silently** produces build for armv6 (compatible, but suboptimal) ``` configure: CFG_BUILD := arm-unknown-linux-gnueabihf ```
2 parents 3752673 + 9b81f3c commit 0a20ec3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

configure

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,16 @@ case $CFG_CPUTYPE in
507507
CFG_CPUTYPE=arm
508508
;;
509509

510-
armv7l)
510+
armv6l)
511511
CFG_CPUTYPE=arm
512512
CFG_OSTYPE="${CFG_OSTYPE}eabihf"
513513
;;
514514

515+
armv7l)
516+
CFG_CPUTYPE=armv7
517+
CFG_OSTYPE="${CFG_OSTYPE}eabihf"
518+
;;
519+
515520
aarch64)
516521
CFG_CPUTYPE=aarch64
517522
;;

0 commit comments

Comments
 (0)