Pb de detection des gcc.

This commit is contained in:
The Alliance Tool 2004-07-23 23:49:35 +00:00
parent 2406afb284
commit aae288bff3
1 changed files with 20 additions and 26 deletions

View File

@ -3,7 +3,7 @@
# Copyright (C) 2004 Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr> # Copyright (C) 2004 Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
# License: GPL (http://www.gnu.org/copyleft/gpl.html) # License: GPL (http://www.gnu.org/copyleft/gpl.html)
# #
# $Id: mkasim,v 1.2 2004/07/23 23:02:18 alliance Exp $ # $Id: mkasim,v 1.3 2004/07/23 23:49:35 alliance Exp $
# #
# /------------------------------------------------------------------\ # /------------------------------------------------------------------\
# | | # | |
@ -169,29 +169,23 @@
guessArch () guessArch ()
{ {
case $1 in case $1 in
"Linux.RH71") if which gcc > /dev/null 2>&1; then "Linux.RH71") TARGET=$LINUX_RH71_TARGET
TARGET=$LINUX_RH71_TARGET CXX=$LINUX_RH71_CXX
CXX=$LINUX_RH71_CXX CC=$LINUX_RH71_CC
CC=$LINUX_RH71_CC ;;
fi "Linux.FC2") TARGET=$LINUX_FC2_TARGET
;; CXX=$LINUX_FC2_CXX
"Linux.FC2") if which gcc > /dev/null 2>&1; then CC=$LINUX_FC2_CC
TARGET=$LINUX_FC2_TARGET ;;
CXX=$LINUX_FC2_CXX "Solaris") TARGET=$SOLARIS_TARGET
CC=$LINUX_FC2_CC CXX=$SOLARIS_CXX
fi CC=$SOLARIS_CC
;; ;;
"Solaris") if [ -x "$SOLARIS_CC" ]; then *) echo "[ERROR] Command failed :"
TARGET=$SOLARIS_TARGET echo " Unsupported architecture := \"`uname -sr`\""
CXX=$SOLARIS_CXX fail
CC=$SOLARIS_CC exit 1
fi ;;
;;
*) echo "[ERROR] Command failed :"
echo " Unsupported architecture := \"`uname -sr`\""
fail
exit 1
;;
esac esac
ALLIANCE_TOP="$ALLIANCE_ROOT/$ARCH" ALLIANCE_TOP="$ALLIANCE_ROOT/$ARCH"
@ -233,9 +227,8 @@
for ARCH in $ARCHS for ARCH in $ARCHS
do do
part "Full ASIM reinstall on Target $TARGET."
guessArch $ARCH guessArch $ARCH
part "Full ASIM reinstall on Target $TARGET."
echo " ALLIANCE_TOP=$ALLIANCE_TOP" echo " ALLIANCE_TOP=$ALLIANCE_TOP"
echo " TARGET=$TARGET" echo " TARGET=$TARGET"
echo " ARCH=$ARCH" echo " ARCH=$ARCH"
@ -255,6 +248,7 @@
try grep Alliance_compilation_OK $TARGETLOGFILE try grep Alliance_compilation_OK $TARGETLOGFILE
try rm -rf $DISTRIBDIR/$TMPBUILDDIR/$TARGET try rm -rf $DISTRIBDIR/$TMPBUILDDIR/$TARGET
done done
try rmdir $DISTRIBDIR/$TMPBUILDDIR
) | perl -ne '$|=1; printf("%s%s", "", $_)' \ ) | perl -ne '$|=1; printf("%s%s", "", $_)' \