mirror of
https://github.com/nginx/nginx.git
synced 2024-12-27 01:11:13 -06:00
remove BMAKE (build make): a cc compiler should use own make
This commit is contained in:
parent
dbebf0bdbc
commit
98c4dd7c60
19
auto/cc/msvc
19
auto/cc/msvc
@ -124,25 +124,14 @@ ngx_binout="-Fe"
|
||||
ngx_objext="obj"
|
||||
ngx_binext=".exe"
|
||||
|
||||
if [ "$BMAKE" = nmake ]; then
|
||||
# MS nmake
|
||||
|
||||
ngx_long_start='@<<
|
||||
ngx_long_start='@<<
|
||||
'
|
||||
ngx_long_end='<<'
|
||||
ngx_long_regex_cont=' \
|
||||
ngx_long_end='<<'
|
||||
ngx_long_regex_cont=' \
|
||||
'
|
||||
ngx_long_cont='
|
||||
ngx_long_cont='
|
||||
'
|
||||
|
||||
else
|
||||
# Borland make
|
||||
|
||||
ngx_long_start='@&&|
|
||||
'
|
||||
ngx_long_end='|'
|
||||
fi
|
||||
|
||||
# MSVC understand / in path
|
||||
#ngx_regex_dirsep='\\'
|
||||
#ngx_dirsep="\\"
|
||||
|
@ -87,3 +87,9 @@ ngx_binext=".exe"
|
||||
|
||||
ngx_regex_dirsep='\\'
|
||||
ngx_dirsep="\\"
|
||||
|
||||
ngx_regex_cont=' '
|
||||
ngx_long_regex_cont=' '
|
||||
ngx_cont=' '
|
||||
ngx_long_cont=' '
|
||||
ngx_tab=' '
|
||||
|
12
auto/make
12
auto/make
@ -23,22 +23,12 @@ LINK = $LINK
|
||||
|
||||
END
|
||||
|
||||
|
||||
if test -n "$NGX_PERL_CFLAGS"; then
|
||||
echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS >> $NGX_MAKEFILE
|
||||
echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS >> $NGX_MAKEFILE
|
||||
fi
|
||||
|
||||
if [ "$BMAKE" = wmake ]; then
|
||||
echo MAKE = wmake >> $NGX_MAKEFILE
|
||||
|
||||
ngx_regex_cont=' '
|
||||
ngx_long_regex_cont=' '
|
||||
ngx_cont=' '
|
||||
ngx_long_cont=' '
|
||||
ngx_tab=' '
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# ALL_INCS, required by the addons and by OpenWatcom C precompiled headers
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user