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

Switch round the order of CFLAGS and XFLAGS, so that the latter

Browse Source 
comes last on the compiler command line. This makes it easier to
override the normal compile options (since conflicting command-line
options usually follow a last-wins policy) in order to compile (for
example) the Unix version -g -O0.

[originally from svn r7170]
This commit is contained in:
Simon Tatham 2007-01-26 19:43:15 +00:00
parent aa67efd0fa
commit f042451e3c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mkfiles.pl
View File

@ -429,7 +429,7 @@ if (defined $makefiles{'cygwin'}) {
if ($d->{obj} =~ /\.res\.o$/) { if ($d->{obj} =~ /\.res\.o$/) {
print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n"; print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
} else { } else {
print "\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n"; print "\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c ".$d->{deps}->[0]."\n\n";
} }
} }
print "\n"; print "\n";
@ -486,7 +486,7 @@ if (defined $makefiles{'borland'}) {
"\n". "\n".
".c.obj:\n". ".c.obj:\n".
&splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)". &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
" \$(XFLAGS) \$(CFLAGS) ". " \$(CFLAGS) \$(XFLAGS) ".
(join " ", map {"-I$dirpfx$_"} @srcdirs) . (join " ", map {"-I$dirpfx$_"} @srcdirs) .
" /c \$*.c",69)."\n". " /c \$*.c",69)."\n".
".rc.res:\n". ".rc.res:\n".
@ -615,7 +615,7 @@ if (defined $makefiles{'vc'}) {
print &splitline(sprintf("%s: %s", $d->{obj}, print &splitline(sprintf("%s: %s", $d->{obj},
join " ", @$extradeps, @{$d->{deps}})), "\n"; join " ", @$extradeps, @{$d->{deps}})), "\n";
if ($d->{obj} =~ /.obj$/) { if ($d->{obj} =~ /.obj$/) {
print "\tcl \$(COMPAT) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n"; print "\tcl \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c ".$d->{deps}->[0],"\n\n";
} else { } else {
print "\trc \$(RCFL) -r \$(RCFLAGS) ".$d->{deps}->[0],"\n\n"; print "\trc \$(RCFL) -r \$(RCFLAGS) ".$d->{deps}->[0],"\n\n";
} }
@ -962,7 +962,7 @@ if (defined $makefiles{'gtk'}) {
print &splitline(sprintf("%s: %s", $d->{obj}, print &splitline(sprintf("%s: %s", $d->{obj},
join " ", @{$d->{deps}})), "\n"; join " ", @{$d->{deps}})), "\n";
} }
print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n"); print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
} }
print "\n"; print "\n";
print $makefile_extra{'gtk'}->{'end'}; print $makefile_extra{'gtk'}->{'end'};
@ -1025,7 +1025,7 @@ if (defined $makefiles{'ac'}) {
print &splitline(sprintf("%s: %s", $d->{obj}, print &splitline(sprintf("%s: %s", $d->{obj},
join " ", @{$d->{deps}})), "\n"; join " ", @{$d->{deps}})), "\n";
} }
print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n"); print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
} }
print "\n"; print "\n";
print $makefile_extra{'gtk'}->{'end'}; print $makefile_extra{'gtk'}->{'end'};
@ -1226,7 +1226,7 @@ if (defined $makefiles{'lcc'}) {
} }
if ($d->{obj} =~ /\.obj$/) { if ($d->{obj} =~ /\.obj$/) {
print &splitline("\tlcc -O -p6 \$(COMPAT)". print &splitline("\tlcc -O -p6 \$(COMPAT)".
" \$(XFLAGS) \$(CFLAGS) ".$d->{deps}->[0],69)."\n"; " \$(CFLAGS) \$(XFLAGS) ".$d->{deps}->[0],69)."\n";
} else { } else {
print &splitline("\tlrc \$(RCFL) -r \$(RCFLAGS) ". print &splitline("\tlrc \$(RCFL) -r \$(RCFLAGS) ".
$d->{deps}->[0],69)."\n"; $d->{deps}->[0],69)."\n";
@ -1311,9 +1311,9 @@ if (defined $makefiles{'osx'}) {
} }
$firstdep = $d->{deps}->[0]; $firstdep = $d->{deps}->[0];
if ($firstdep =~ /\.c$/) { if ($firstdep =~ /\.c$/) {
print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n"; print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n";
} elsif ($firstdep =~ /\.m$/) { } elsif ($firstdep =~ /\.m$/) {
print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n"; print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n";
} }
} }
print "\n".$makefile_extra{'osx'}->{'end'}; print "\n".$makefile_extra{'osx'}->{'end'};