Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/make/windows/build_vm_def.sh Tue Jan 31 13:12:39 2012 +0100 +++ b/make/windows/build_vm_def.sh Mon Feb 06 09:14:22 2012 +0100 @@ -57,10 +57,10 @@ # When called from IDE the first param should contain the link version, otherwise may be nill if [ "x$1" != "x" ]; then -LINK_VER="$1" +LD_VER="$1" fi -if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" -a "x$LINK_VER" != "x1000" ]; then +if [ "x$LD_VER" != "x800" -a "x$LD_VER" != "x900" -a "x$LD_VER" != "x1000" ]; then $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def else # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def