From 1b2f0f190d32233de8e93549b9446d6de2b62dd7 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sat, 23 Feb 2008 02:10:40 +0000 Subject: [PATCH] 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 --- src/windows/build/bkw.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl index 9984a3343..ee93203bf 100644 --- 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."; -- 2.26.2