Skip to content

Commit 4ba6891

Browse files
committed
---
yaml --- r: 54130 b: refs/heads/dist-snap c: ff9c943 h: refs/heads/master v: v3
1 parent 689e71b commit 4ba6891

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: 5591d347cfe14bf484b44be47112fd3baf5b059d
10+
refs/heads/dist-snap: ff9c943c08628f5e60ca681345d23522f566da31
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/configure

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ fi
574574
CFG_PREFIX=${CFG_PREFIX%/}
575575
CFG_HOST_TRIPLES="$(echo $CFG_HOST_TRIPLES | tr ',' ' ')"
576576
CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
577+
CFG_SUPPORTED_TARGET_TRIPLES="$(grep ^CC_*=* $CFG_SRC_DIR/mk/platform.mk | sed 's,^[^_]*_,,' | sed 's/\([^=]*\).*/\1/' | xargs)"
577578

578579
# copy host-triples to target-triples so that hosts are a subset of targets
579580
V_TEMP=""
@@ -586,8 +587,22 @@ CFG_TARGET_TRIPLES=$V_TEMP
586587
# check target-specific tool-chains
587588
for i in $CFG_TARGET_TRIPLES
588589
do
590+
L_CHECK=false
591+
for j in $CFG_SUPPORTED_TARGET_TRIPLES
592+
do
593+
if [ $i = $j ]
594+
then
595+
L_CHECK=true
596+
fi
597+
done
598+
599+
if [ $L_CHECK = false ]
600+
then
601+
err "unsupported target triples \"$i\" found"
602+
fi
603+
589604
case $i in
590-
arm-unknown-android)
605+
arm-linux-androideabi)
591606

592607
if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-gcc ]
593608
then

0 commit comments

Comments
 (0)