nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-01 01:10:29 -05:00
Code Issues Projects Releases Wiki Activity

Fix build breakage on Unix.

Browse Source 
Occurred as a side effect of commit 198bca233, in which I wrote a Perl
loop of the form 'foreach $srcdir (@srcdirs)' inside which I modified
$srcdir - forgetting the Perl gotcha that if you do that, $srcdir
temporarily aliases the actual array element, so you end up modifying
the array you iterated over. Hence, a set of transformations intended
to convert the source directory list into a special form for the nmake
batch-mode inference rule syntax in particular ended up back in
@srcdirs to be reflected in unrelated makefiles output later in the
run.
This commit is contained in:
Simon Tatham 2015-12-17 09:06:53 +00:00
parent d3db17f3e1
commit 50ea866e4c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkfiles.pl
View File

@ -677,12 +677,13 @@ if (defined $makefiles{'vc'}) {
} }
} }
print "\n"; print "\n";
foreach $srcdir ("", @srcdirs) { foreach $real_srcdir ("", @srcdirs) {
$srcdir = $real_srcdir;
if ($srcdir ne "") { if ($srcdir ne "") {
$srcdir =~ s!/!\\!g; $srcdir =~ s!/!\\!g;
$srcdir = $dirpfx . $srcdir; $srcdir = $dirpfx . $srcdir;
$srcdir =~ s!\\\.\\!\\!; $srcdir =~ s!\\\.\\!\\!;
$srcdir = "{$srcdir}" $srcdir = "{$srcdir}";
} }
# The double colon at the end of the line makes this a # The double colon at the end of the line makes this a
# 'batch-mode inference rule', which means that nmake will # 'batch-mode inference rule', which means that nmake will