[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/mkstages/

[Yuta SATOH]

commit:     093a6ac384d993ca66e78607bfce91923d57395c
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Nov 15 16:24:53 2014 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Nov 15 16:24:53 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=093a6ac3

stages_builder.sh: Add the code to download clang stage3.

---
 scripts/mkstages/stages_builder.sh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh 
b/scripts/mkstages/stages_builder.sh
index a4eeff0..d95eb85 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -43,10 +43,21 @@ prepare(){
                mkdir -p /var/tmp/catalyst/builds/default
        fi
 
-       if [ ! -e 
"/var/tmp/catalyst/builds/default/stage3-${TARGETSUBARCH}-freebsd-${OLDVER}.tar.bz2"
 ] && [ -z "${FORCESTAGE3}" ]; then
-               echo "Downloading aballier's ${TARGETSUBARCH} stage3 file..."
-               wget -q -P /var/tmp/catalyst/builds/default 
http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/stage3-${TARGETSUBARCH}-freebsd-${OLDVER}.tar.bz2
-               [[ $? -ne 0 ]] && exit 1
+       if [ -z "${FORCESTAGE3}" ] ; then
+               if [ -z "${CLANG}" ] ; then
+                       local 
oldstage3fn="stage3-${TARGETSUBARCH}-freebsd-${OLDVER}"
+                       local 
oldstage3url="http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/${oldstage3fn}.tar.bz2";
+               else
+                       local 
oldstage3fn="stage3-${TARGETSUBARCH}-clangfbsd-${OLDVER}"
+                       local 
oldstage3url="http://dev.gentoo.org/~aballier/fbsd${OLDVER}/${TARGETARCH}/clang/${oldstage3fn}.tar.bz2";
+               fi
+
+               if [ ! -e 
"/var/tmp/catalyst/builds/default/${oldstage3fn}.tar.bz2" ] ; then
+                       echo "Downloading aballier's ${TARGETSUBARCH} stage3 
file..."
+                       wget -q -P /var/tmp/catalyst/builds/default 
"${oldstage3url}"
+                       [[ $? -ne 0 ]] && exit 1
+                       export FORCESTAGE3="${oldstage3fn}"
+               fi
        fi
 
        cd ${WORKDIR}