Fossil SCM
fix cross-compilation of mingw target on Linux/Darwin
Commit
9c0e1caec5ecaedbdb7a43fc17c8b3bf5044d473
Parent
f15ce59b002adaa…
2 files changed
+4
-4
+4
-4
+4
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -536,14 +536,14 @@ | ||
| 536 | 536 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 537 | 537 | # use forward slashes for correctness. If the SHELL environment variable |
| 538 | 538 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 539 | 539 | # |
| 540 | 540 | ifdef SHELL |
| 541 | -TRANSLATE = $(OBJDIR)/translate.exe | |
| 542 | -MAKEHEADERS = $(OBJDIR)/makeheaders.exe | |
| 543 | -MKINDEX = $(OBJDIR)/mkindex.exe | |
| 544 | -VERSION = $(OBJDIR)/version.exe | |
| 541 | +TRANSLATE = $(OBJDIR)/translate | |
| 542 | +MAKEHEADERS = $(OBJDIR)/makeheaders | |
| 543 | +MKINDEX = $(OBJDIR)/mkindex | |
| 544 | +VERSION = $(OBJDIR)/version | |
| 545 | 545 | else |
| 546 | 546 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe) |
| 547 | 547 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe) |
| 548 | 548 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe) |
| 549 | 549 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 550 | 550 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -536,14 +536,14 @@ | |
| 536 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 537 | # use forward slashes for correctness. If the SHELL environment variable |
| 538 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 539 | # |
| 540 | ifdef SHELL |
| 541 | TRANSLATE = $(OBJDIR)/translate.exe |
| 542 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 543 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 544 | VERSION = $(OBJDIR)/version.exe |
| 545 | else |
| 546 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe) |
| 547 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe) |
| 548 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe) |
| 549 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 550 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -536,14 +536,14 @@ | |
| 536 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 537 | # use forward slashes for correctness. If the SHELL environment variable |
| 538 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 539 | # |
| 540 | ifdef SHELL |
| 541 | TRANSLATE = $(OBJDIR)/translate |
| 542 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 543 | MKINDEX = $(OBJDIR)/mkindex |
| 544 | VERSION = $(OBJDIR)/version |
| 545 | else |
| 546 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe) |
| 547 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe) |
| 548 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe) |
| 549 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 550 |
+4
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -500,14 +500,14 @@ | ||
| 500 | 500 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 501 | 501 | # use forward slashes for correctness. If the SHELL environment variable |
| 502 | 502 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 503 | 503 | # |
| 504 | 504 | ifdef SHELL |
| 505 | -TRANSLATE = $(OBJDIR)/translate.exe | |
| 506 | -MAKEHEADERS = $(OBJDIR)/makeheaders.exe | |
| 507 | -MKINDEX = $(OBJDIR)/mkindex.exe | |
| 508 | -VERSION = $(OBJDIR)/version.exe | |
| 505 | +TRANSLATE = $(OBJDIR)/translate | |
| 506 | +MAKEHEADERS = $(OBJDIR)/makeheaders | |
| 507 | +MKINDEX = $(OBJDIR)/mkindex | |
| 508 | +VERSION = $(OBJDIR)/version | |
| 509 | 509 | else |
| 510 | 510 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe) |
| 511 | 511 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe) |
| 512 | 512 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe) |
| 513 | 513 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 514 | 514 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -500,14 +500,14 @@ | |
| 500 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 501 | # use forward slashes for correctness. If the SHELL environment variable |
| 502 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 503 | # |
| 504 | ifdef SHELL |
| 505 | TRANSLATE = $(OBJDIR)/translate.exe |
| 506 | MAKEHEADERS = $(OBJDIR)/makeheaders.exe |
| 507 | MKINDEX = $(OBJDIR)/mkindex.exe |
| 508 | VERSION = $(OBJDIR)/version.exe |
| 509 | else |
| 510 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe) |
| 511 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe) |
| 512 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe) |
| 513 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 514 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -500,14 +500,14 @@ | |
| 500 | #### Attempt to determine if this is the actual MSYS shell. If so, we need to |
| 501 | # use forward slashes for correctness. If the SHELL environment variable |
| 502 | # exists, it is assumed that we are building inside of a Unix-style shell. |
| 503 | # |
| 504 | ifdef SHELL |
| 505 | TRANSLATE = $(OBJDIR)/translate |
| 506 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 507 | MKINDEX = $(OBJDIR)/mkindex |
| 508 | VERSION = $(OBJDIR)/version |
| 509 | else |
| 510 | TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe) |
| 511 | MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe) |
| 512 | MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe) |
| 513 | VERSION = $(subst /,\\,$(OBJDIR)/version.exe) |
| 514 |