Fossil SCM
Moved the -lpthread for --static builds from the end of EXTRA_LDFLAGS to the end of LIBS, since the latter ends up at the end of "LIB" in the Makefile. In other words, the prior formulation put -lpthread in the *middle* of the LIB line, not at the end as intended.
Commit
08ad0f52714aca3ab33667f6005b8d326d7b46c3e3b09ff8b23f64d135eb96b4
Parent
53caec9524d73e0…
1 file changed
+1
-1
M
auto.def
+1
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -620,11 +620,11 @@ | ||
| 620 | 620 | define-append LIBS [get-define lib_dlopen] |
| 621 | 621 | } |
| 622 | 622 | if {[opt-bool static]} { |
| 623 | 623 | # Linux can only infer the dependency on pthread from OpenSSL when |
| 624 | 624 | # doing dynamic linkage. |
| 625 | - define-append EXTRA_LDFLAGS -lpthread | |
| 625 | + define-append LIBS -lpthread | |
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | |
| 629 | 629 | make-template Makefile.in |
| 630 | 630 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 631 | 631 |
| --- auto.def | |
| +++ auto.def | |
| @@ -620,11 +620,11 @@ | |
| 620 | define-append LIBS [get-define lib_dlopen] |
| 621 | } |
| 622 | if {[opt-bool static]} { |
| 623 | # Linux can only infer the dependency on pthread from OpenSSL when |
| 624 | # doing dynamic linkage. |
| 625 | define-append EXTRA_LDFLAGS -lpthread |
| 626 | } |
| 627 | |
| 628 | |
| 629 | make-template Makefile.in |
| 630 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 631 |
| --- auto.def | |
| +++ auto.def | |
| @@ -620,11 +620,11 @@ | |
| 620 | define-append LIBS [get-define lib_dlopen] |
| 621 | } |
| 622 | if {[opt-bool static]} { |
| 623 | # Linux can only infer the dependency on pthread from OpenSSL when |
| 624 | # doing dynamic linkage. |
| 625 | define-append LIBS -lpthread |
| 626 | } |
| 627 | |
| 628 | |
| 629 | make-template Makefile.in |
| 630 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 631 |