Mercurial > hg > truffle
comparison make/windows/get_msc_ver.sh @ 4891:719f7007c8e8
7141242: build-infra merge: Rename CPP->CXX and LINK->LD
Summary: Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker.
Reviewed-by: dholmes, ohrstrom
author | erikj |
---|---|
date | Mon, 06 Feb 2012 09:14:22 +0100 |
parents | 0a8e0d4345b3 |
children | b9a9ed0f8eeb |
comparison
equal
deleted
inserted
replaced
4890:c77d473e71f7 | 4891:719f7007c8e8 |
---|---|
70 fi | 70 fi |
71 echo "MSC_VER=$MSC_VER" | 71 echo "MSC_VER=$MSC_VER" |
72 echo "MSC_VER_RAW=$MSC_VER_RAW" | 72 echo "MSC_VER_RAW=$MSC_VER_RAW" |
73 fi | 73 fi |
74 | 74 |
75 if [ "x$FORCE_LINK_VER" != "x" ]; then | 75 if [ "x$FORCE_LD_VER" != "x" ]; then |
76 echo "LINK_VER=$FORCE_LINK_VER" | 76 echo "LD_VER=$FORCE_LD_VER" |
77 else | 77 else |
78 # use the "link" command that is co-located with the "cl" command | 78 # use the "link" command that is co-located with the "cl" command |
79 cl_cmd=`which cl` | 79 cl_cmd=`which cl` |
80 if [ "x$cl_cmd" != "x" ]; then | 80 if [ "x$cl_cmd" != "x" ]; then |
81 link_cmd=`$DIRNAME "$cl_cmd"`/link | 81 link_cmd=`$DIRNAME "$cl_cmd"`/link |
82 else | 82 else |
83 # which can't find "cl" so just use which ever "link" we find | 83 # which can't find "cl" so just use which ever "link" we find |
84 link_cmd="link" | 84 link_cmd="link" |
85 fi | 85 fi |
86 LINK_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'` | 86 LD_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'` |
87 LINK_VER_MAJOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f1` | 87 LD_VER_MAJOR=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f1` |
88 LINK_VER_MINOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f2` | 88 LD_VER_MINOR=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f2` |
89 LINK_VER_MICRO=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f3` | 89 LD_VER_MICRO=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f3` |
90 LINK_VER=`"$EXPR" $LINK_VER_MAJOR \* 100 + $LINK_VER_MINOR` | 90 LD_VER=`"$EXPR" $LD_VER_MAJOR \* 100 + $LD_VER_MINOR` |
91 echo "LINK_VER=$LINK_VER" | 91 echo "LD_VER=$LD_VER" |
92 echo "LINK_VER_RAW=$LINK_VER_RAW" | 92 echo "LD_VER_RAW=$LD_VER_RAW" |
93 fi | 93 fi |