comparison make/windows/build_vm_def.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 aa6e219afbf1
children 33df1aeaebbf b9a9ed0f8eeb
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
55 RM="$MKS_HOME/rm.exe" 55 RM="$MKS_HOME/rm.exe"
56 DUMPBIN="link.exe /dump" 56 DUMPBIN="link.exe /dump"
57 57
58 # When called from IDE the first param should contain the link version, otherwise may be nill 58 # When called from IDE the first param should contain the link version, otherwise may be nill
59 if [ "x$1" != "x" ]; then 59 if [ "x$1" != "x" ]; then
60 LINK_VER="$1" 60 LD_VER="$1"
61 fi 61 fi
62 62
63 if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" -a "x$LINK_VER" != "x1000" ]; then 63 if [ "x$LD_VER" != "x800" -a "x$LD_VER" != "x900" -a "x$LD_VER" != "x1000" ]; then
64 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def 64 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
65 else 65 else
66 # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def 66 # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def
67 $DUMPBIN /OUT:vm3.def /symbols *.obj 67 $DUMPBIN /OUT:vm3.def /symbols *.obj
68 "$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def 68 "$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def