Fossil SCM
Fix mingw64 build (broken by [8f2dd0106ef3b5aa])
Commit
db59821f890cf66dc3187a88568499d4e0d77e97
Parent
496c0fea3b4d482…
3 files changed
+4
-4
+4
-4
+4
-4
+4
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1096,21 +1096,21 @@ | ||
| 1096 | 1096 | BLDTARGETS = zlib |
| 1097 | 1097 | endif |
| 1098 | 1098 | |
| 1099 | 1099 | openssl: $(BLDTARGETS) |
| 1100 | 1100 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1101 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1101 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1102 | 1102 | |
| 1103 | 1103 | clean-openssl: |
| 1104 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1104 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1105 | 1105 | |
| 1106 | 1106 | tcl: |
| 1107 | 1107 | cd $(TCLSRCDIR)/win;./configure |
| 1108 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1108 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1109 | 1109 | |
| 1110 | 1110 | clean-tcl: |
| 1111 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1111 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1112 | 1112 | |
| 1113 | 1113 | APPTARGETS += $(BLDTARGETS) |
| 1114 | 1114 | |
| 1115 | 1115 | ifdef FOSSIL_BUILD_SSL |
| 1116 | 1116 | APPTARGETS += openssl |
| 1117 | 1117 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1096,21 +1096,21 @@ | |
| 1096 | BLDTARGETS = zlib |
| 1097 | endif |
| 1098 | |
| 1099 | openssl: $(BLDTARGETS) |
| 1100 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1101 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1102 | |
| 1103 | clean-openssl: |
| 1104 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1105 | |
| 1106 | tcl: |
| 1107 | cd $(TCLSRCDIR)/win;./configure |
| 1108 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1109 | |
| 1110 | clean-tcl: |
| 1111 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1112 | |
| 1113 | APPTARGETS += $(BLDTARGETS) |
| 1114 | |
| 1115 | ifdef FOSSIL_BUILD_SSL |
| 1116 | APPTARGETS += openssl |
| 1117 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1096,21 +1096,21 @@ | |
| 1096 | BLDTARGETS = zlib |
| 1097 | endif |
| 1098 | |
| 1099 | openssl: $(BLDTARGETS) |
| 1100 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1101 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1102 | |
| 1103 | clean-openssl: |
| 1104 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1105 | |
| 1106 | tcl: |
| 1107 | cd $(TCLSRCDIR)/win;./configure |
| 1108 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1109 | |
| 1110 | clean-tcl: |
| 1111 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1112 | |
| 1113 | APPTARGETS += $(BLDTARGETS) |
| 1114 | |
| 1115 | ifdef FOSSIL_BUILD_SSL |
| 1116 | APPTARGETS += openssl |
| 1117 |
+4
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -1002,21 +1002,21 @@ | ||
| 1002 | 1002 | BLDTARGETS = zlib |
| 1003 | 1003 | endif |
| 1004 | 1004 | |
| 1005 | 1005 | openssl: $(BLDTARGETS) |
| 1006 | 1006 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1007 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1007 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1008 | 1008 | |
| 1009 | 1009 | clean-openssl: |
| 1010 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1010 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1011 | 1011 | |
| 1012 | 1012 | tcl: |
| 1013 | 1013 | cd $(TCLSRCDIR)/win;./configure |
| 1014 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1014 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1015 | 1015 | |
| 1016 | 1016 | clean-tcl: |
| 1017 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1017 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1018 | 1018 | |
| 1019 | 1019 | APPTARGETS += $(BLDTARGETS) |
| 1020 | 1020 | |
| 1021 | 1021 | ifdef FOSSIL_BUILD_SSL |
| 1022 | 1022 | APPTARGETS += openssl |
| 1023 | 1023 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1002,21 +1002,21 @@ | |
| 1002 | BLDTARGETS = zlib |
| 1003 | endif |
| 1004 | |
| 1005 | openssl: $(BLDTARGETS) |
| 1006 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1007 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1008 | |
| 1009 | clean-openssl: |
| 1010 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1011 | |
| 1012 | tcl: |
| 1013 | cd $(TCLSRCDIR)/win;./configure |
| 1014 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1015 | |
| 1016 | clean-tcl: |
| 1017 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1018 | |
| 1019 | APPTARGETS += $(BLDTARGETS) |
| 1020 | |
| 1021 | ifdef FOSSIL_BUILD_SSL |
| 1022 | APPTARGETS += openssl |
| 1023 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1002,21 +1002,21 @@ | |
| 1002 | BLDTARGETS = zlib |
| 1003 | endif |
| 1004 | |
| 1005 | openssl: $(BLDTARGETS) |
| 1006 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1007 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1008 | |
| 1009 | clean-openssl: |
| 1010 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1011 | |
| 1012 | tcl: |
| 1013 | cd $(TCLSRCDIR)/win;./configure |
| 1014 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1015 | |
| 1016 | clean-tcl: |
| 1017 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1018 | |
| 1019 | APPTARGETS += $(BLDTARGETS) |
| 1020 | |
| 1021 | ifdef FOSSIL_BUILD_SSL |
| 1022 | APPTARGETS += openssl |
| 1023 |
+4
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -1002,21 +1002,21 @@ | ||
| 1002 | 1002 | BLDTARGETS = zlib |
| 1003 | 1003 | endif |
| 1004 | 1004 | |
| 1005 | 1005 | openssl: $(BLDTARGETS) |
| 1006 | 1006 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1007 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1007 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1008 | 1008 | |
| 1009 | 1009 | clean-openssl: |
| 1010 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1010 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1011 | 1011 | |
| 1012 | 1012 | tcl: |
| 1013 | 1013 | cd $(TCLSRCDIR)/win;./configure |
| 1014 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1014 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1015 | 1015 | |
| 1016 | 1016 | clean-tcl: |
| 1017 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1017 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1018 | 1018 | |
| 1019 | 1019 | APPTARGETS += $(BLDTARGETS) |
| 1020 | 1020 | |
| 1021 | 1021 | ifdef FOSSIL_BUILD_SSL |
| 1022 | 1022 | APPTARGETS += openssl |
| 1023 | 1023 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1002,21 +1002,21 @@ | |
| 1002 | BLDTARGETS = zlib |
| 1003 | endif |
| 1004 | |
| 1005 | openssl: $(BLDTARGETS) |
| 1006 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1007 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1008 | |
| 1009 | clean-openssl: |
| 1010 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1011 | |
| 1012 | tcl: |
| 1013 | cd $(TCLSRCDIR)/win;./configure |
| 1014 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1015 | |
| 1016 | clean-tcl: |
| 1017 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1018 | |
| 1019 | APPTARGETS += $(BLDTARGETS) |
| 1020 | |
| 1021 | ifdef FOSSIL_BUILD_SSL |
| 1022 | APPTARGETS += openssl |
| 1023 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1002,21 +1002,21 @@ | |
| 1002 | BLDTARGETS = zlib |
| 1003 | endif |
| 1004 | |
| 1005 | openssl: $(BLDTARGETS) |
| 1006 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1007 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1008 | |
| 1009 | clean-openssl: |
| 1010 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1011 | |
| 1012 | tcl: |
| 1013 | cd $(TCLSRCDIR)/win;./configure |
| 1014 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1015 | |
| 1016 | clean-tcl: |
| 1017 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1018 | |
| 1019 | APPTARGETS += $(BLDTARGETS) |
| 1020 | |
| 1021 | ifdef FOSSIL_BUILD_SSL |
| 1022 | APPTARGETS += openssl |
| 1023 |