186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

bugfix: we removed the existing Makefile even for ./configure --help.

Browse Source 
Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
This commit is contained in:
spacewander 2017-12-09 23:33:25 +08:00 committed by Yichun Zhang (agentzh)
parent dd46539557
commit 2cc5ba6c91
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/sanity.t
View File

@ -1327,8 +1327,8 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "gcc-4.2": No such file or directory at ./configure line 625. Can't exec "gcc-4.2": No such file or directory at ./configure line 621.
Can't exec "gcc-4.2": No such file or directory at ./configure line 663. Can't exec "gcc-4.2": No such file or directory at ./configure line 659.
@ -1498,8 +1498,8 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "cl": No such file or directory at ./configure line 625. Can't exec "cl": No such file or directory at ./configure line 621.
Can't exec "cl": No such file or directory at ./configure line 663. Can't exec "cl": No such file or directory at ./configure line 659.
@ -1700,7 +1700,7 @@ clean:
--- err --- err
--with-libpq is not allowed when --with-pg_config is already specified. --with-libpq is not allowed when --with-pg_config is already specified.
--- exit: 2 --- exit: 255
@ -2297,7 +2297,7 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "sw_vers": No such file or directory at ./configure line 722. Can't exec "sw_vers": No such file or directory at ./configure line 718.
@ -2382,7 +2382,7 @@ install: all
clean: clean:
rm -rf build rm -rf build
--- err --- err
Can't exec "sw_vers": No such file or directory at ./configure line 722. Can't exec "sw_vers": No such file or directory at ./configure line 718.

9
util/configure vendored
View File

@ -23,10 +23,6 @@ my $OS = $^O;
my $ngx_dir; my $ngx_dir;
if (-f 'Makefile') {
unlink 'Makefile' or die "ERROR: failed to remove existing Makefile: $!\n";
}
for my $opt (@ARGV) { for my $opt (@ARGV) {
if ($opt =~ /^--platform=(.*)/) { if ($opt =~ /^--platform=(.*)/) {
$OS = $1; $OS = $1;
@ -1368,6 +1364,11 @@ _EOC_
} }
sub gen_makefile { sub gen_makefile {
if (-f 'Makefile') {
unlink 'Makefile' or
die "ERROR: failed to remove existing Makefile: $!\n";
}
open my $out, ">Makefile" or open my $out, ">Makefile" or
die "Cannot open Makefile for writing: $!\n"; die "Cannot open Makefile for writing: $!\n";