Fossil SCM
if openssl is compiled with zlib support enabled, then -lz should be after -lssl -lcrypto
Commit
69608104d2e8bf7e2dc322e2b616faea49440282
Parent
57603caf36d30d1…
1 file changed
+8
-6
+8
-6
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -145,18 +145,14 @@ | ||
| 145 | 145 | ifdef FOSSIL_ENABLE_JSON |
| 146 | 146 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 147 | 147 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 148 | 148 | endif |
| 149 | 149 | |
| 150 | -#### Extra arguments for linking the finished binary. Fossil needs | |
| 151 | -# to link against the Z-Lib compression library. There are no | |
| 152 | -# other mandatory dependencies. We add the -static option here | |
| 153 | -# so that we can build a static executable that will run in a | |
| 154 | -# chroot jail. | |
| 150 | +#### We add the -static option here so that we can build a static | |
| 151 | +# executable that will run in a chroot jail. | |
| 155 | 152 | # |
| 156 | 153 | LIB = -static |
| 157 | -LIB += -lmingwex -lz | |
| 158 | 154 | |
| 159 | 155 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 160 | 156 | ifdef FOSSIL_ENABLE_SSL |
| 161 | 157 | LIB += -lssl -lcrypto -lgdi32 |
| 162 | 158 | endif |
| @@ -163,10 +159,16 @@ | ||
| 163 | 159 | |
| 164 | 160 | # Tcl: Add the necessary libraries required, if enabled. |
| 165 | 161 | ifdef FOSSIL_ENABLE_TCL |
| 166 | 162 | LIB += $(LIBTCL) |
| 167 | 163 | endif |
| 164 | + | |
| 165 | +#### Extra arguments for linking the finished binary. Fossil needs | |
| 166 | +# to link against the Z-Lib compression library. There are no | |
| 167 | +# other mandatory dependencies. | |
| 168 | +# | |
| 169 | +LIB += -lmingwex -lz | |
| 168 | 170 | |
| 169 | 171 | #### These libraries MUST appear in the same order as they do for Tcl |
| 170 | 172 | # or linking with it will not work (exact reason unknown). |
| 171 | 173 | # |
| 172 | 174 | ifdef FOSSIL_ENABLE_TCL |
| 173 | 175 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -145,18 +145,14 @@ | |
| 145 | ifdef FOSSIL_ENABLE_JSON |
| 146 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 147 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 148 | endif |
| 149 | |
| 150 | #### Extra arguments for linking the finished binary. Fossil needs |
| 151 | # to link against the Z-Lib compression library. There are no |
| 152 | # other mandatory dependencies. We add the -static option here |
| 153 | # so that we can build a static executable that will run in a |
| 154 | # chroot jail. |
| 155 | # |
| 156 | LIB = -static |
| 157 | LIB += -lmingwex -lz |
| 158 | |
| 159 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 160 | ifdef FOSSIL_ENABLE_SSL |
| 161 | LIB += -lssl -lcrypto -lgdi32 |
| 162 | endif |
| @@ -163,10 +159,16 @@ | |
| 163 | |
| 164 | # Tcl: Add the necessary libraries required, if enabled. |
| 165 | ifdef FOSSIL_ENABLE_TCL |
| 166 | LIB += $(LIBTCL) |
| 167 | endif |
| 168 | |
| 169 | #### These libraries MUST appear in the same order as they do for Tcl |
| 170 | # or linking with it will not work (exact reason unknown). |
| 171 | # |
| 172 | ifdef FOSSIL_ENABLE_TCL |
| 173 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -145,18 +145,14 @@ | |
| 145 | ifdef FOSSIL_ENABLE_JSON |
| 146 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 147 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 148 | endif |
| 149 | |
| 150 | #### We add the -static option here so that we can build a static |
| 151 | # executable that will run in a chroot jail. |
| 152 | # |
| 153 | LIB = -static |
| 154 | |
| 155 | # OpenSSL: Add the necessary libraries required, if enabled. |
| 156 | ifdef FOSSIL_ENABLE_SSL |
| 157 | LIB += -lssl -lcrypto -lgdi32 |
| 158 | endif |
| @@ -163,10 +159,16 @@ | |
| 159 | |
| 160 | # Tcl: Add the necessary libraries required, if enabled. |
| 161 | ifdef FOSSIL_ENABLE_TCL |
| 162 | LIB += $(LIBTCL) |
| 163 | endif |
| 164 | |
| 165 | #### Extra arguments for linking the finished binary. Fossil needs |
| 166 | # to link against the Z-Lib compression library. There are no |
| 167 | # other mandatory dependencies. |
| 168 | # |
| 169 | LIB += -lmingwex -lz |
| 170 | |
| 171 | #### These libraries MUST appear in the same order as they do for Tcl |
| 172 | # or linking with it will not work (exact reason unknown). |
| 173 | # |
| 174 | ifdef FOSSIL_ENABLE_TCL |
| 175 |