1.1 --- a/make/windows/build_vm_def.sh Tue Dec 14 15:10:52 2010 -0500
1.2 +++ b/make/windows/build_vm_def.sh Wed Dec 15 07:11:31 2010 -0800
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -45,6 +45,9 @@
1.11 echo "EXPORTS" > vm1.def
1.12
1.13 AWK="$MKS_HOME/awk.exe"
1.14 +if [ ! -e $AWK ]; then
1.15 + AWK="$MKS_HOME/gawk.exe"
1.16 +fi
1.17 GREP="$MKS_HOME/grep.exe"
1.18 SORT="$MKS_HOME/sort.exe"
1.19 UNIQ="$MKS_HOME/uniq.exe"
1.20 @@ -57,7 +60,7 @@
1.21 LINK_VER="$1"
1.22 fi
1.23
1.24 -if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" ]; then
1.25 +if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" -a "x$LINK_VER" != "x1000" ]; then
1.26 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
1.27 else
1.28 # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def
