Commit 49bf2e2f authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge changes I51d42a50,Id8aaf820,I6af91959

* changes:
  configure: extend armv7 hf target autodetect
  configure: remove default CROSS for arm targets
  configure: avoid default when CROSS is set to null
parents 8faccb70 b524cca5
...@@ -647,7 +647,7 @@ process_common_toolchain() { ...@@ -647,7 +647,7 @@ process_common_toolchain() {
armv6*) armv6*)
tgt_isa=armv6 tgt_isa=armv6
;; ;;
armv7*-hardfloat*) armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
tgt_isa=armv7 tgt_isa=armv7
float_abi=hard float_abi=hard
;; ;;
...@@ -877,7 +877,6 @@ process_common_toolchain() { ...@@ -877,7 +877,6 @@ process_common_toolchain() {
case ${tgt_cc} in case ${tgt_cc} in
gcc) gcc)
CROSS=${CROSS:-arm-none-linux-gnueabi-}
link_with_cc=gcc link_with_cc=gcc
setup_gnu_toolchain setup_gnu_toolchain
arch_int=${tgt_isa##armv} arch_int=${tgt_isa##armv}
...@@ -1135,7 +1134,7 @@ EOF ...@@ -1135,7 +1134,7 @@ EOF
CC=${CC:-${CROSS}gcc} CC=${CC:-${CROSS}gcc}
CXX=${CXX:-${CROSS}g++} CXX=${CXX:-${CROSS}g++}
LD=${LD:-${CROSS}gcc} LD=${LD:-${CROSS}gcc}
CROSS=${CROSS:-g} CROSS=${CROSS-g}
;; ;;
os2) os2)
disable_feature pic disable_feature pic
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment