caam

changeset 13:b403946716d6

find changesets by author, revision, files, or words in the commit message
Export main variables for DO jobs
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 26 Sep 2013 11:47:00 +0900
parents 90d1d0f6c627
children f12119170e39
files bin/caam wrap/c++
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/bin/caam	Mon Jun 10 10:57:00 2013 +0900
     1.2 +++ b/bin/caam	Thu Sep 26 11:47:00 2013 +0900
     1.3 @@ -8,7 +8,7 @@
     1.4  ca=`echo $CAAM_ADD|tr : ' '`
     1.5  cpx=`echo $CAAM_PREFIXES|tr : ' '`
     1.6  CAAM_GCC=${GCC:-`which gcc`}
     1.7 -CAAM_CXX=${GCC:-`which c++`}
     1.8 +CAAM_CXX=${CXX:-`which c++`}
     1.9  if [ -x /usr/xpg4/bin/sh ]; then
    1.10    CAAM_SH=/usr/xpg4/bin/sh
    1.11  else
    1.12 @@ -207,6 +207,7 @@
    1.13  LD_LIBRARY_PATH="$lp" \
    1.14  PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\" \
    1.15  GCC=\"$CAAM_GCC\" \
    1.16 +CXX=\"$CAAM_CXX\" \
    1.17  sh -c "$CAAM_CFG $* && $DO"
    1.18  
    1.19  PATH=$PATH \
    1.20 @@ -215,6 +216,8 @@
    1.21  LDFLAGS="$LDFLAGS" \
    1.22  LD_LIBRARY_PATH="$lp" \
    1.23  CAAM_GCC=$CAAM_GCC \
    1.24 -CAAM_CXX=$CAAM_CXX \
    1.25 +CAAM_CXX=$CAAM_CXX
    1.26 +export PATH CFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH LD_RUN_PATH
    1.27 +export CAAM_GCC CAAM_CXX
    1.28  sh -c "$CAAM_CFG $*" &&
    1.29 -$SUSPEND && sh -c "$DO" && successlog
    1.30 +  $SUSPEND && sh -c "$DO" && successlog

     2.1 --- a/wrap/c++	Mon Jun 10 10:57:00 2013 +0900
     2.2 +++ b/wrap/c++	Thu Sep 26 11:47:00 2013 +0900
     2.3 @@ -12,5 +12,5 @@
     2.4      IFS=$oifs
     2.5    fi
     2.6  fi
     2.7 -# echo cmd=$CAAM_GCC $ldf "$@"
     2.8 +# echo cmd=$CAAM_CXX $ldf "$@"
     2.9  exec $CAAM_CXX $ldf "$@"