Skip to content

Commit 8613af7

Browse files
committed
---
yaml --- r: 49563 b: refs/heads/master c: ff9c943 h: refs/heads/master i: 49561: a9573bd 49559: 0268d24 v: v3
1 parent 67f3729 commit 8613af7

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 5591d347cfe14bf484b44be47112fd3baf5b059d
2+
refs/heads/master: ff9c943c08628f5e60ca681345d23522f566da31
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
55
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/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)