Fossil SCM
(cherry-pick) Fix mingw64 build (broken by [8f2dd0106ef3b5aa])
Commit
8a4fa47ed137018a15e4e94015a1e6d4b4d3b11a
Parent
8166001e0acd6bc…
6 files changed
+4
-4
+4
-4
+4
-4
+4
-4
+4
-4
+4
-4
+4
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1093,21 +1093,21 @@ | ||
| 1093 | 1093 | BLDTARGETS = zlib |
| 1094 | 1094 | endif |
| 1095 | 1095 | |
| 1096 | 1096 | openssl: $(BLDTARGETS) |
| 1097 | 1097 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1098 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1098 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1099 | 1099 | |
| 1100 | 1100 | clean-openssl: |
| 1101 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1101 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1102 | 1102 | |
| 1103 | 1103 | tcl: |
| 1104 | 1104 | cd $(TCLSRCDIR)/win;./configure |
| 1105 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1105 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1106 | 1106 | |
| 1107 | 1107 | clean-tcl: |
| 1108 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1108 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1109 | 1109 | |
| 1110 | 1110 | APPTARGETS += $(BLDTARGETS) |
| 1111 | 1111 | |
| 1112 | 1112 | ifdef FOSSIL_BUILD_SSL |
| 1113 | 1113 | APPTARGETS += openssl |
| 1114 | 1114 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1093,21 +1093,21 @@ | |
| 1093 | BLDTARGETS = zlib |
| 1094 | endif |
| 1095 | |
| 1096 | openssl: $(BLDTARGETS) |
| 1097 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1098 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1099 | |
| 1100 | clean-openssl: |
| 1101 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1102 | |
| 1103 | tcl: |
| 1104 | cd $(TCLSRCDIR)/win;./configure |
| 1105 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1106 | |
| 1107 | clean-tcl: |
| 1108 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1109 | |
| 1110 | APPTARGETS += $(BLDTARGETS) |
| 1111 | |
| 1112 | ifdef FOSSIL_BUILD_SSL |
| 1113 | APPTARGETS += openssl |
| 1114 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1093,21 +1093,21 @@ | |
| 1093 | BLDTARGETS = zlib |
| 1094 | endif |
| 1095 | |
| 1096 | openssl: $(BLDTARGETS) |
| 1097 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1098 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1099 | |
| 1100 | clean-openssl: |
| 1101 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1102 | |
| 1103 | tcl: |
| 1104 | cd $(TCLSRCDIR)/win;./configure |
| 1105 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1106 | |
| 1107 | clean-tcl: |
| 1108 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1109 | |
| 1110 | APPTARGETS += $(BLDTARGETS) |
| 1111 | |
| 1112 | ifdef FOSSIL_BUILD_SSL |
| 1113 | APPTARGETS += openssl |
| 1114 |
+4
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -1093,21 +1093,21 @@ | ||
| 1093 | 1093 | BLDTARGETS = zlib |
| 1094 | 1094 | endif |
| 1095 | 1095 | |
| 1096 | 1096 | openssl: $(BLDTARGETS) |
| 1097 | 1097 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1098 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1098 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1099 | 1099 | |
| 1100 | 1100 | clean-openssl: |
| 1101 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1101 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1102 | 1102 | |
| 1103 | 1103 | tcl: |
| 1104 | 1104 | cd $(TCLSRCDIR)/win;./configure |
| 1105 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1105 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1106 | 1106 | |
| 1107 | 1107 | clean-tcl: |
| 1108 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1108 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1109 | 1109 | |
| 1110 | 1110 | APPTARGETS += $(BLDTARGETS) |
| 1111 | 1111 | |
| 1112 | 1112 | ifdef FOSSIL_BUILD_SSL |
| 1113 | 1113 | APPTARGETS += openssl |
| 1114 | 1114 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1093,21 +1093,21 @@ | |
| 1093 | BLDTARGETS = zlib |
| 1094 | endif |
| 1095 | |
| 1096 | openssl: $(BLDTARGETS) |
| 1097 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1098 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1099 | |
| 1100 | clean-openssl: |
| 1101 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1102 | |
| 1103 | tcl: |
| 1104 | cd $(TCLSRCDIR)/win;./configure |
| 1105 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1106 | |
| 1107 | clean-tcl: |
| 1108 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1109 | |
| 1110 | APPTARGETS += $(BLDTARGETS) |
| 1111 | |
| 1112 | ifdef FOSSIL_BUILD_SSL |
| 1113 | APPTARGETS += openssl |
| 1114 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -1093,21 +1093,21 @@ | |
| 1093 | BLDTARGETS = zlib |
| 1094 | endif |
| 1095 | |
| 1096 | openssl: $(BLDTARGETS) |
| 1097 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1098 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1099 | |
| 1100 | clean-openssl: |
| 1101 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1102 | |
| 1103 | tcl: |
| 1104 | cd $(TCLSRCDIR)/win;./configure |
| 1105 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1106 | |
| 1107 | clean-tcl: |
| 1108 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1109 | |
| 1110 | APPTARGETS += $(BLDTARGETS) |
| 1111 | |
| 1112 | ifdef FOSSIL_BUILD_SSL |
| 1113 | APPTARGETS += openssl |
| 1114 |
+4
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -996,21 +996,21 @@ | ||
| 996 | 996 | BLDTARGETS = zlib |
| 997 | 997 | endif |
| 998 | 998 | |
| 999 | 999 | openssl: $(BLDTARGETS) |
| 1000 | 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1001 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1002 | 1002 | |
| 1003 | 1003 | clean-openssl: |
| 1004 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1004 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1005 | 1005 | |
| 1006 | 1006 | tcl: |
| 1007 | 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1008 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1009 | 1009 | |
| 1010 | 1010 | clean-tcl: |
| 1011 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1011 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1012 | 1012 | |
| 1013 | 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | 1014 | |
| 1015 | 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | 1016 | APPTARGETS += openssl |
| 1017 | 1017 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |
+4
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -996,21 +996,21 @@ | ||
| 996 | 996 | BLDTARGETS = zlib |
| 997 | 997 | endif |
| 998 | 998 | |
| 999 | 999 | openssl: $(BLDTARGETS) |
| 1000 | 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1001 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1002 | 1002 | |
| 1003 | 1003 | clean-openssl: |
| 1004 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1004 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1005 | 1005 | |
| 1006 | 1006 | tcl: |
| 1007 | 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1008 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1009 | 1009 | |
| 1010 | 1010 | clean-tcl: |
| 1011 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1011 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1012 | 1012 | |
| 1013 | 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | 1014 | |
| 1015 | 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | 1016 | APPTARGETS += openssl |
| 1017 | 1017 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |
+4
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -996,21 +996,21 @@ | ||
| 996 | 996 | BLDTARGETS = zlib |
| 997 | 997 | endif |
| 998 | 998 | |
| 999 | 999 | openssl: $(BLDTARGETS) |
| 1000 | 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1001 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1002 | 1002 | |
| 1003 | 1003 | clean-openssl: |
| 1004 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1004 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1005 | 1005 | |
| 1006 | 1006 | tcl: |
| 1007 | 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1008 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1009 | 1009 | |
| 1010 | 1010 | clean-tcl: |
| 1011 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1011 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1012 | 1012 | |
| 1013 | 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | 1014 | |
| 1015 | 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | 1016 | APPTARGETS += openssl |
| 1017 | 1017 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |
+4
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -996,21 +996,21 @@ | ||
| 996 | 996 | BLDTARGETS = zlib |
| 997 | 997 | endif |
| 998 | 998 | |
| 999 | 999 | openssl: $(BLDTARGETS) |
| 1000 | 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs | |
| 1001 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs | |
| 1002 | 1002 | |
| 1003 | 1003 | clean-openssl: |
| 1004 | - $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean | |
| 1004 | + $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean | |
| 1005 | 1005 | |
| 1006 | 1006 | tcl: |
| 1007 | 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) | |
| 1008 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) | |
| 1009 | 1009 | |
| 1010 | 1010 | clean-tcl: |
| 1011 | - $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean | |
| 1011 | + $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean | |
| 1012 | 1012 | |
| 1013 | 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | 1014 | |
| 1015 | 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | 1016 | APPTARGETS += openssl |
| 1017 | 1017 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) CC=$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win CC=$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -996,21 +996,21 @@ | |
| 996 | BLDTARGETS = zlib |
| 997 | endif |
| 998 | |
| 999 | openssl: $(BLDTARGETS) |
| 1000 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG) |
| 1001 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs |
| 1002 | |
| 1003 | clean-openssl: |
| 1004 | $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) clean |
| 1005 | |
| 1006 | tcl: |
| 1007 | cd $(TCLSRCDIR)/win;./configure |
| 1008 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(TCLTARGET) |
| 1009 | |
| 1010 | clean-tcl: |
| 1011 | $(MAKE) -C $(TCLSRCDIR)/win PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) distclean |
| 1012 | |
| 1013 | APPTARGETS += $(BLDTARGETS) |
| 1014 | |
| 1015 | ifdef FOSSIL_BUILD_SSL |
| 1016 | APPTARGETS += openssl |
| 1017 |