summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-01-28 21:34:14 (GMT)
committerGitHub <noreply@github.com>2017-01-28 21:34:14 (GMT)
commit5b084c005b2669340594adeb2bf10a0d8a0fe623 (patch)
tree0aeba68a08520698392701f6ac9a69f26e38c8bd /scripts
parentd0682f9ad5492ea541edb77d1c39d82144477b8a (diff)
parent7a94c81e5bf171d1258aa60438482fd44e5f9800 (diff)
Merge pull request #564 from stilor/comptools-default-to-y-if-missing
Rework configure logic wrt GNU autotools
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/companion_tools.sh23
1 files changed, 4 insertions, 19 deletions
diff --git a/scripts/build/companion_tools.sh b/scripts/build/companion_tools.sh
index 415f3a2..b190ed7 100644
--- a/scripts/build/companion_tools.sh
+++ b/scripts/build/companion_tools.sh
@@ -31,23 +31,6 @@ do_companion_tools_extract() {
# Build the companion tools facilities for build
do_companion_tools_for_build() {
- # Skip out if:
- # - native/cross, and companion tools were neither selected
- # to be built, nor included in the final toolchain
- # - canadian/cross-native, and companion tools were not
- # selected to be built
- case "${CT_TOOLCHAIN_TYPE}" in
- native|cross)
- if [ -z "${CT_COMP_TOOLS}${CT_COMP_TOOLS_FOR_HOST}" ]; then
- return
- fi
- ;;
- canadian|cross-native)
- if [ -z "${CT_COMP_TOOLS}" ]; then
- return
- fi
- ;;
- esac
for f in ${CT_COMP_TOOLS_FACILITY_LIST}; do
do_companion_tools_${f}_for_build
done
@@ -55,12 +38,14 @@ do_companion_tools_for_build() {
# Build the companion tools facilities for host
do_companion_tools_for_host() {
- # For native/cross, build==host, and the tools were built
- # earlier by do_companion_tools_for_build.
case "${CT_TOOLCHAIN_TYPE}" in
+ # For native/cross, build==host, skip: the tools were built
+ # earlier by do_companion_tools_for_build.
native|cross)
return
;;
+ # For canadian/cross-native, only need to build tools for host
+ # if explicitly requested.
canadian|cross-native)
if [ -z "${CT_COMP_TOOLS_FOR_HOST}" ]; then
return