Fossil SCM
Move auto.def tests which are specifically commented as 'must be last' to the end of auto.def, below the newly-moved openssl check.
Commit
ea2fbaf05ab1fd054d1402342996fd21a465f642732e99fd15b9dff450c2b83f
Parent
eeec6c894ed9cfc…
1 file changed
+13
-14
M
auto.def
+13
-14
| --- auto.def | ||
| +++ auto.def | ||
| @@ -862,24 +862,10 @@ | ||
| 862 | 862 | # We need to link with libubsan if we're compiling under |
| 863 | 863 | # GCC with -fsanitize=undefined. |
| 864 | 864 | cc-check-function-in-lib __ubsan_handle_add_overflow ubsan |
| 865 | 865 | } |
| 866 | 866 | } |
| 867 | - | |
| 868 | -# Finally, append libraries that must be last. This matters more on some | |
| 869 | -# OSes than others, but is most broadly required for static linking. | |
| 870 | -if {[check-function-in-lib dlopen dl]} { | |
| 871 | - # Some platforms (*BSD) have the dl functions already in libc and no libdl. | |
| 872 | - # In such case we can link directly without -ldl. | |
| 873 | - define-append LIBS [get-define lib_dlopen] | |
| 874 | -} | |
| 875 | -if {[opt-bool static]} { | |
| 876 | - # Linux can only infer the dependency on pthread from OpenSSL when | |
| 877 | - # doing dynamic linkage. | |
| 878 | - define-append LIBS -lpthread | |
| 879 | -} | |
| 880 | - | |
| 881 | 867 | |
| 882 | 868 | ######################################################################## |
| 883 | 869 | # @proj-check-emsdk |
| 884 | 870 | # |
| 885 | 871 | # Emscripten is used for doing in-tree builds of web-based WASM stuff, |
| @@ -958,10 +944,23 @@ | ||
| 958 | 944 | define EMCC_OPT "" |
| 959 | 945 | catch {exec rm -f tools/emcc.sh} |
| 960 | 946 | } |
| 961 | 947 | |
| 962 | 948 | handle-with-openssl |
| 949 | + | |
| 950 | +# Finally, append libraries that must be last. This matters more on some | |
| 951 | +# OSes than others, but is most broadly required for static linking. | |
| 952 | +if {[check-function-in-lib dlopen dl]} { | |
| 953 | + # Some platforms (*BSD) have the dl functions already in libc and no libdl. | |
| 954 | + # In such case we can link directly without -ldl. | |
| 955 | + define-append LIBS [get-define lib_dlopen] | |
| 956 | +} | |
| 957 | +if {[opt-bool static]} { | |
| 958 | + # Linux can only infer the dependency on pthread from OpenSSL when | |
| 959 | + # doing dynamic linkage. | |
| 960 | + define-append LIBS -lpthread | |
| 961 | +} | |
| 963 | 962 | |
| 964 | 963 | # Tag container builds with a prefix of the checkin ID of the version |
| 965 | 964 | # of Fossil each one contains. This not only allows multiple images |
| 966 | 965 | # to coexist and multiple containers to be created unamgiguosly from |
| 967 | 966 | # them, it also changes the URL we fetch the source tarball from, so |
| 968 | 967 |
| --- auto.def | |
| +++ auto.def | |
| @@ -862,24 +862,10 @@ | |
| 862 | # We need to link with libubsan if we're compiling under |
| 863 | # GCC with -fsanitize=undefined. |
| 864 | cc-check-function-in-lib __ubsan_handle_add_overflow ubsan |
| 865 | } |
| 866 | } |
| 867 | |
| 868 | # Finally, append libraries that must be last. This matters more on some |
| 869 | # OSes than others, but is most broadly required for static linking. |
| 870 | if {[check-function-in-lib dlopen dl]} { |
| 871 | # Some platforms (*BSD) have the dl functions already in libc and no libdl. |
| 872 | # In such case we can link directly without -ldl. |
| 873 | define-append LIBS [get-define lib_dlopen] |
| 874 | } |
| 875 | if {[opt-bool static]} { |
| 876 | # Linux can only infer the dependency on pthread from OpenSSL when |
| 877 | # doing dynamic linkage. |
| 878 | define-append LIBS -lpthread |
| 879 | } |
| 880 | |
| 881 | |
| 882 | ######################################################################## |
| 883 | # @proj-check-emsdk |
| 884 | # |
| 885 | # Emscripten is used for doing in-tree builds of web-based WASM stuff, |
| @@ -958,10 +944,23 @@ | |
| 958 | define EMCC_OPT "" |
| 959 | catch {exec rm -f tools/emcc.sh} |
| 960 | } |
| 961 | |
| 962 | handle-with-openssl |
| 963 | |
| 964 | # Tag container builds with a prefix of the checkin ID of the version |
| 965 | # of Fossil each one contains. This not only allows multiple images |
| 966 | # to coexist and multiple containers to be created unamgiguosly from |
| 967 | # them, it also changes the URL we fetch the source tarball from, so |
| 968 |
| --- auto.def | |
| +++ auto.def | |
| @@ -862,24 +862,10 @@ | |
| 862 | # We need to link with libubsan if we're compiling under |
| 863 | # GCC with -fsanitize=undefined. |
| 864 | cc-check-function-in-lib __ubsan_handle_add_overflow ubsan |
| 865 | } |
| 866 | } |
| 867 | |
| 868 | ######################################################################## |
| 869 | # @proj-check-emsdk |
| 870 | # |
| 871 | # Emscripten is used for doing in-tree builds of web-based WASM stuff, |
| @@ -958,10 +944,23 @@ | |
| 944 | define EMCC_OPT "" |
| 945 | catch {exec rm -f tools/emcc.sh} |
| 946 | } |
| 947 | |
| 948 | handle-with-openssl |
| 949 | |
| 950 | # Finally, append libraries that must be last. This matters more on some |
| 951 | # OSes than others, but is most broadly required for static linking. |
| 952 | if {[check-function-in-lib dlopen dl]} { |
| 953 | # Some platforms (*BSD) have the dl functions already in libc and no libdl. |
| 954 | # In such case we can link directly without -ldl. |
| 955 | define-append LIBS [get-define lib_dlopen] |
| 956 | } |
| 957 | if {[opt-bool static]} { |
| 958 | # Linux can only infer the dependency on pthread from OpenSSL when |
| 959 | # doing dynamic linkage. |
| 960 | define-append LIBS -lpthread |
| 961 | } |
| 962 | |
| 963 | # Tag container builds with a prefix of the checkin ID of the version |
| 964 | # of Fossil each one contains. This not only allows multiple images |
| 965 | # to coexist and multiple containers to be created unamgiguosly from |
| 966 | # them, it also changes the URL we fetch the source tarball from, so |
| 967 |