Re: [PATCH] Use .exe for binaries for all win32 compilers
Hello! On Tue, Jun 06, 2017 at 05:54:01PM +0300, Orgad Shaneh wrote: > > http://mailman.nginx.org/pipermail/nginx-devel/2016-December/009234.html > > Thanks. It is needed with MSYS2 / gcc. Proposing a new patch: > > --- > auto/cc/bcc | 1 - > auto/cc/conf | 7 ++- > auto/cc/msvc | 1 - > auto/cc/owc | 1 - > 4 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/auto/cc/bcc b/auto/cc/bcc > index ec82e60f..e990a9f7 100644 > --- a/auto/cc/bcc > +++ b/auto/cc/bcc > @@ -62,7 +62,6 @@ ngx_include_opt="-I" > ngx_objout="-o" > ngx_binout="-e" > ngx_objext="obj" > -ngx_binext=".exe" > > ngx_long_start='@&&| > ' > diff --git a/auto/cc/conf b/auto/cc/conf > index afbca62b..7e1186b5 100644 > --- a/auto/cc/conf > +++ b/auto/cc/conf > @@ -14,9 +14,14 @@ ngx_pic_opt="-fPIC" > ngx_objout="-o " > ngx_binout="-o " > ngx_objext="o" > -ngx_binext= > ngx_modext=".so" > > +if [ "$NGX_PLATFORM" = win32 ]; then > +ngx_binext=".exe" > +else > +ngx_binext= > +fi > + > ngx_long_start= > ngx_long_end= > Looking more at this I tend to think that a better place would be to redefine it in auto/os/win32, like this: diff --git a/auto/os/win32 b/auto/os/win32 --- a/auto/os/win32 +++ b/auto/os/win32 @@ -13,6 +13,7 @@ NGX_ICONS="$NGX_WIN32_ICONS" SELECT_SRCS=$WIN32_SELECT_SRCS ngx_pic_opt= +ngx_binext=".exe" case "$NGX_CC_NAME" in Full patch modified accordingly provided below. Please test if it works for you. # HG changeset patch # User Orgad Shaneh # Date 1496767054 -10800 # Tue Jun 06 19:37:34 2017 +0300 # Node ID 6c9b1238cf5c99ffc5a8a449ce738606e312350e # Parent 23bea7aaebe287722ec5b5252e145da55d7906a9 Configure: use .exe for binaries for all win32 compilers. diff --git a/auto/cc/bcc b/auto/cc/bcc --- a/auto/cc/bcc +++ b/auto/cc/bcc @@ -62,7 +62,6 @@ ngx_include_opt="-I" ngx_objout="-o" ngx_binout="-e" ngx_objext="obj" -ngx_binext=".exe" ngx_long_start='@&&| ' diff --git a/auto/cc/msvc b/auto/cc/msvc --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -142,7 +142,6 @@ ngx_pic_opt= ngx_objout="-Fo" ngx_binout="-Fe" ngx_objext="obj" -ngx_binext=".exe" ngx_long_start='@<< ' diff --git a/auto/cc/owc b/auto/cc/owc --- a/auto/cc/owc +++ b/auto/cc/owc @@ -84,7 +84,6 @@ ngx_include_opt="-i=" ngx_objout="-fo" ngx_binout="-fe=" ngx_objext="obj" -ngx_binext=".exe" ngx_regex_dirsep='\\' ngx_dirsep="\\" diff --git a/auto/os/win32 b/auto/os/win32 --- a/auto/os/win32 +++ b/auto/os/win32 @@ -13,6 +13,7 @@ NGX_ICONS="$NGX_WIN32_ICONS" SELECT_SRCS=$WIN32_SELECT_SRCS ngx_pic_opt= +ngx_binext=".exe" case "$NGX_CC_NAME" in -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH] Use .exe for binaries for all win32 compilers
> http://mailman.nginx.org/pipermail/nginx-devel/2016-December/009234.html Thanks. It is needed with MSYS2 / gcc. Proposing a new patch: --- auto/cc/bcc | 1 - auto/cc/conf | 7 ++- auto/cc/msvc | 1 - auto/cc/owc | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/auto/cc/bcc b/auto/cc/bcc index ec82e60f..e990a9f7 100644 --- a/auto/cc/bcc +++ b/auto/cc/bcc @@ -62,7 +62,6 @@ ngx_include_opt="-I" ngx_objout="-o" ngx_binout="-e" ngx_objext="obj" -ngx_binext=".exe" ngx_long_start='@&&| ' diff --git a/auto/cc/conf b/auto/cc/conf index afbca62b..7e1186b5 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -14,9 +14,14 @@ ngx_pic_opt="-fPIC" ngx_objout="-o " ngx_binout="-o " ngx_objext="o" -ngx_binext= ngx_modext=".so" +if [ "$NGX_PLATFORM" = win32 ]; then +ngx_binext=".exe" +else +ngx_binext= +fi + ngx_long_start= ngx_long_end= diff --git a/auto/cc/msvc b/auto/cc/msvc index 4eef1010..82572529 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -142,7 +142,6 @@ ngx_pic_opt= ngx_objout="-Fo" ngx_binout="-Fe" ngx_objext="obj" -ngx_binext=".exe" ngx_long_start='@<< ' diff --git a/auto/cc/owc b/auto/cc/owc index a063aa34..f7fd88c9 100644 --- a/auto/cc/owc +++ b/auto/cc/owc @@ -84,7 +84,6 @@ ngx_include_opt="-i=" ngx_objout="-fo" ngx_binout="-fe=" ngx_objext="obj" -ngx_binext=".exe" ngx_regex_dirsep='\\' ngx_dirsep="\\" -- 2.13.0.windows.1.7.g80a6209eb5 ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH] Use .exe for binaries for all win32 compilers
Hello! On Tue, Jun 06, 2017 at 01:58:17PM +0300, Orgad Shaneh wrote: > --- > auto/cc/conf | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/auto/cc/conf b/auto/cc/conf > index afbca62b..19a231aa 100644 > --- a/auto/cc/conf > +++ b/auto/cc/conf > @@ -144,7 +144,9 @@ fi > CFLAGS="$CFLAGS $NGX_CC_OPT" > NGX_TEST_LD_OPT="$NGX_LD_OPT" > > -if [ "$NGX_PLATFORM" != win32 ]; then > +if [ "$NGX_PLATFORM" = win32 ]; then > +ngx_binext=".exe" > +else > > if test -n "$NGX_LD_OPT"; then > ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" > -- > 2.13.0.windows.1.7.g80a6209eb5 http://mailman.nginx.org/pipermail/nginx-devel/2016-December/009234.html -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
[PATCH] Use .exe for binaries for all win32 compilers
--- auto/cc/conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/auto/cc/conf b/auto/cc/conf index afbca62b..19a231aa 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -144,7 +144,9 @@ fi CFLAGS="$CFLAGS $NGX_CC_OPT" NGX_TEST_LD_OPT="$NGX_LD_OPT" -if [ "$NGX_PLATFORM" != win32 ]; then +if [ "$NGX_PLATFORM" = win32 ]; then +ngx_binext=".exe" +else if test -n "$NGX_LD_OPT"; then ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" -- 2.13.0.windows.1.7.g80a6209eb5 ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
Re: [PATCH] Use .exe for binaries for all win32 compilers
Hello! On Tue, Nov 29, 2016 at 11:32:03AM +0200, Orgad Shaneh wrote: > Hi, > > I'm not sure if this is the right place to do this. Please review and comment. > > # HG changeset patch > # User Orgad Shaneh > # Date 1480411801 -7200 > # Tue Nov 29 11:30:01 2016 +0200 > # Node ID 017b0c3afbbf960b9f29a892a82a77e9f17b6774 > # Parent e036a4628d9cc8803579d7d41848d528488eca6d > Use .exe for binaries for all win32 compilers > > diff -r e036a4628d9c -r 017b0c3afbbf auto/cc/conf > --- a/auto/cc/conf Tue Nov 29 09:37:45 2016 +0200 > +++ b/auto/cc/conf Tue Nov 29 11:30:01 2016 +0200 > @@ -144,7 +144,9 @@ > CFLAGS="$CFLAGS $NGX_CC_OPT" > NGX_TEST_LD_OPT="$NGX_LD_OPT" > > -if [ "$NGX_PLATFORM" != win32 ]; then > +if [ "$NGX_PLATFORM" = win32 ]; then > +ngx_binext=".exe" > +else > > if test -n "$NGX_LD_OPT"; then > ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" > Not sure it's at all needed. But if it is, it should be somewhere before per-compiler calls instead, e.g.: diff --git a/auto/cc/conf b/auto/cc/conf --- a/auto/cc/conf +++ b/auto/cc/conf @@ -17,6 +17,10 @@ ngx_objext="o" ngx_binext= ngx_modext=".so" +if [ "$NGX_PLATFORM" = win32 ]; then +ngx_binext=".exe" +fi + ngx_long_start= ngx_long_end= And also should imply removing ngx_binext from particular compilers. -- Maxim Dounin http://nginx.org/ ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
[PATCH] Use .exe for binaries for all win32 compilers
Hi, I'm not sure if this is the right place to do this. Please review and comment. # HG changeset patch # User Orgad Shaneh # Date 1480411801 -7200 # Tue Nov 29 11:30:01 2016 +0200 # Node ID 017b0c3afbbf960b9f29a892a82a77e9f17b6774 # Parent e036a4628d9cc8803579d7d41848d528488eca6d Use .exe for binaries for all win32 compilers diff -r e036a4628d9c -r 017b0c3afbbf auto/cc/conf --- a/auto/cc/conf Tue Nov 29 09:37:45 2016 +0200 +++ b/auto/cc/conf Tue Nov 29 11:30:01 2016 +0200 @@ -144,7 +144,9 @@ CFLAGS="$CFLAGS $NGX_CC_OPT" NGX_TEST_LD_OPT="$NGX_LD_OPT" -if [ "$NGX_PLATFORM" != win32 ]; then +if [ "$NGX_PLATFORM" = win32 ]; then +ngx_binext=".exe" +else if test -n "$NGX_LD_OPT"; then ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" ___ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel