Fossil SCM
A little bit smarter determination of the need for -DBROKEN_MINGW_CMDLINE
Commit
0e5c128047f8039cd6c627565a6632b9b60cf8fa
Parent
2056f624c0f8898…
3 files changed
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -401,11 +401,11 @@ | ||
| 401 | 401 | |
| 402 | 402 | #### Check if the workaround for the MinGW command line handling needs to |
| 403 | 403 | # be enabled by default. |
| 404 | 404 | # |
| 405 | 405 | ifndef BROKEN_MINGW_CMDLINE |
| 406 | -ifeq ($(PREFIX),) | |
| 406 | +ifeq (,$(findstring w64-mingw32,$(PREFIX))) | |
| 407 | 407 | BROKEN_MINGW_CMDLINE = 1 |
| 408 | 408 | endif |
| 409 | 409 | endif |
| 410 | 410 | |
| 411 | 411 | #### The directories where the zlib include and library files are located. |
| 412 | 412 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -401,11 +401,11 @@ | |
| 401 | |
| 402 | #### Check if the workaround for the MinGW command line handling needs to |
| 403 | # be enabled by default. |
| 404 | # |
| 405 | ifndef BROKEN_MINGW_CMDLINE |
| 406 | ifeq ($(PREFIX),) |
| 407 | BROKEN_MINGW_CMDLINE = 1 |
| 408 | endif |
| 409 | endif |
| 410 | |
| 411 | #### The directories where the zlib include and library files are located. |
| 412 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -401,11 +401,11 @@ | |
| 401 | |
| 402 | #### Check if the workaround for the MinGW command line handling needs to |
| 403 | # be enabled by default. |
| 404 | # |
| 405 | ifndef BROKEN_MINGW_CMDLINE |
| 406 | ifeq (,$(findstring w64-mingw32,$(PREFIX))) |
| 407 | BROKEN_MINGW_CMDLINE = 1 |
| 408 | endif |
| 409 | endif |
| 410 | |
| 411 | #### The directories where the zlib include and library files are located. |
| 412 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -69,11 +69,11 @@ | ||
| 69 | 69 | |
| 70 | 70 | #### Check if the workaround for the MinGW command line handling needs to |
| 71 | 71 | # be enabled by default. |
| 72 | 72 | # |
| 73 | 73 | ifndef BROKEN_MINGW_CMDLINE |
| 74 | -ifeq ($(PREFIX),) | |
| 74 | +ifeq (,$(findstring w64-mingw32,$(PREFIX))) | |
| 75 | 75 | BROKEN_MINGW_CMDLINE = 1 |
| 76 | 76 | endif |
| 77 | 77 | endif |
| 78 | 78 | |
| 79 | 79 | #### The directories where the zlib include and library files are located. |
| 80 | 80 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -69,11 +69,11 @@ | |
| 69 | |
| 70 | #### Check if the workaround for the MinGW command line handling needs to |
| 71 | # be enabled by default. |
| 72 | # |
| 73 | ifndef BROKEN_MINGW_CMDLINE |
| 74 | ifeq ($(PREFIX),) |
| 75 | BROKEN_MINGW_CMDLINE = 1 |
| 76 | endif |
| 77 | endif |
| 78 | |
| 79 | #### The directories where the zlib include and library files are located. |
| 80 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -69,11 +69,11 @@ | |
| 69 | |
| 70 | #### Check if the workaround for the MinGW command line handling needs to |
| 71 | # be enabled by default. |
| 72 | # |
| 73 | ifndef BROKEN_MINGW_CMDLINE |
| 74 | ifeq (,$(findstring w64-mingw32,$(PREFIX))) |
| 75 | BROKEN_MINGW_CMDLINE = 1 |
| 76 | endif |
| 77 | endif |
| 78 | |
| 79 | #### The directories where the zlib include and library files are located. |
| 80 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -69,11 +69,11 @@ | ||
| 69 | 69 | |
| 70 | 70 | #### Check if the workaround for the MinGW command line handling needs to |
| 71 | 71 | # be enabled by default. |
| 72 | 72 | # |
| 73 | 73 | ifndef BROKEN_MINGW_CMDLINE |
| 74 | -ifeq ($(PREFIX),) | |
| 74 | +ifeq (,$(findstring w64-mingw32,$(PREFIX))) | |
| 75 | 75 | BROKEN_MINGW_CMDLINE = 1 |
| 76 | 76 | endif |
| 77 | 77 | endif |
| 78 | 78 | |
| 79 | 79 | #### The directories where the zlib include and library files are located. |
| 80 | 80 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -69,11 +69,11 @@ | |
| 69 | |
| 70 | #### Check if the workaround for the MinGW command line handling needs to |
| 71 | # be enabled by default. |
| 72 | # |
| 73 | ifndef BROKEN_MINGW_CMDLINE |
| 74 | ifeq ($(PREFIX),) |
| 75 | BROKEN_MINGW_CMDLINE = 1 |
| 76 | endif |
| 77 | endif |
| 78 | |
| 79 | #### The directories where the zlib include and library files are located. |
| 80 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -69,11 +69,11 @@ | |
| 69 | |
| 70 | #### Check if the workaround for the MinGW command line handling needs to |
| 71 | # be enabled by default. |
| 72 | # |
| 73 | ifndef BROKEN_MINGW_CMDLINE |
| 74 | ifeq (,$(findstring w64-mingw32,$(PREFIX))) |
| 75 | BROKEN_MINGW_CMDLINE = 1 |
| 76 | endif |
| 77 | endif |
| 78 | |
| 79 | #### The directories where the zlib include and library files are located. |
| 80 |