pull up r20213 from trunk

 r20213@cathode-dark-space:  kpkoch | 2008-01-31 10:51:18 -0500
 TargetVersion: 1.7
 Component: windows
 Ticket: new
 Subj: Build automation
 Tags:  pullup

 Actually pass the nmake arguments to nmake.

ticket: 5879
version_fixed: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20236 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 9984a334377c3ae45fdd0cdf082fbd24484e3293..ee93203bfe69d1b5180f06c262761d7b2d3379c6 100644 (file)
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -316,11 +316,11 @@ sub main {
         }
 
     print "Executing $cmdline\n";
-    local $argvsize = @ARGV;
+    local $argvsize     = @ARGV;
+    local $nmakeargs    = "";
     if ($argvsize > 0) {
-        print "\nArguments for NMAKE: ";
-        map {print " $_ "} @ARGV;
-        print "\n";
+        map {$nmakeargs .= " $_ "} @ARGV;
+        print "Arguments for NMAKE: $nmakeargs\n";
         }
        
     print "Info -- Using unix find in $odr->{unixfind}->{value}\n"   if ($verbose);
@@ -519,7 +519,7 @@ sub main {
         chdir("$wd\\athena") or die "Fatal -- couldn't chdir to source directory $wd\\athena\n";
         print "Info -- chdir to ".`cd`."\n"         if ($verbose);
         local $dbgswitch = ($odr->{debug}->{def}) ? " " : "NODEBUG=1";
-        !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget $dbgswitch BUILD_KFW=1 BUILD_OFFICIAL=1 DEBUG_SYMBOL=1")
+        !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget $dbgswitch BUILD_KFW=1 BUILD_OFFICIAL=1 DEBUG_SYMBOL=1 $nmakeargs")
             or die "Fatal -- build $buildtarget failed.";
             
         chdir("$wd")                        or die "Fatal -- couldn't chdir to $wd.";