Fossil SCM
unbreak mingw-w64 build
Commit
14cf3f3c9ddafad2013fc67146f61c3e37209d9e
Parent
7ef7284d6b02461…
3 files changed
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -659,11 +659,11 @@ | ||
| 659 | 659 | ifdef FOSSIL_ENABLE_TCL |
| 660 | 660 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 661 | 661 | endif |
| 662 | 662 | |
| 663 | 663 | zlib: |
| 664 | - make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a | |
| 664 | + make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 665 | 665 | |
| 666 | 666 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 667 | 667 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 668 | 668 | |
| 669 | 669 | # This rule prevents make from using its default rules to try build |
| 670 | 670 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -659,11 +659,11 @@ | |
| 659 | ifdef FOSSIL_ENABLE_TCL |
| 660 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 661 | endif |
| 662 | |
| 663 | zlib: |
| 664 | make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a |
| 665 | |
| 666 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 667 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 668 | |
| 669 | # This rule prevents make from using its default rules to try build |
| 670 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -659,11 +659,11 @@ | |
| 659 | ifdef FOSSIL_ENABLE_TCL |
| 660 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 661 | endif |
| 662 | |
| 663 | zlib: |
| 664 | make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 665 | |
| 666 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 667 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 668 | |
| 669 | # This rule prevents make from using its default rules to try build |
| 670 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -612,11 +612,11 @@ | ||
| 612 | 612 | ifdef FOSSIL_ENABLE_TCL |
| 613 | 613 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 614 | 614 | endif |
| 615 | 615 | |
| 616 | 616 | zlib: |
| 617 | - make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a | |
| 617 | + make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 618 | 618 | |
| 619 | 619 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 620 | 620 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 621 | 621 | |
| 622 | 622 | # This rule prevents make from using its default rules to try build |
| 623 | 623 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -612,11 +612,11 @@ | |
| 612 | ifdef FOSSIL_ENABLE_TCL |
| 613 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 614 | endif |
| 615 | |
| 616 | zlib: |
| 617 | make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a |
| 618 | |
| 619 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 620 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 621 | |
| 622 | # This rule prevents make from using its default rules to try build |
| 623 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -612,11 +612,11 @@ | |
| 612 | ifdef FOSSIL_ENABLE_TCL |
| 613 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 614 | endif |
| 615 | |
| 616 | zlib: |
| 617 | make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 618 | |
| 619 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 620 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 621 | |
| 622 | # This rule prevents make from using its default rules to try build |
| 623 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -612,11 +612,11 @@ | ||
| 612 | 612 | ifdef FOSSIL_ENABLE_TCL |
| 613 | 613 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 614 | 614 | endif |
| 615 | 615 | |
| 616 | 616 | zlib: |
| 617 | - make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a | |
| 617 | + make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 618 | 618 | |
| 619 | 619 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 620 | 620 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 621 | 621 | |
| 622 | 622 | # This rule prevents make from using its default rules to try build |
| 623 | 623 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -612,11 +612,11 @@ | |
| 612 | ifdef FOSSIL_ENABLE_TCL |
| 613 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 614 | endif |
| 615 | |
| 616 | zlib: |
| 617 | make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a |
| 618 | |
| 619 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 620 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 621 | |
| 622 | # This rule prevents make from using its default rules to try build |
| 623 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -612,11 +612,11 @@ | |
| 612 | ifdef FOSSIL_ENABLE_TCL |
| 613 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 614 | endif |
| 615 | |
| 616 | zlib: |
| 617 | make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 618 | |
| 619 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 620 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 621 | |
| 622 | # This rule prevents make from using its default rules to try build |
| 623 |