Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged

2024-12-06 19:41:15 +01:00 · 2018-07-31 19:56:23 -04:00
parent 7e4ac0283e 17f922d371
commit fdaa483098
60 changed files with 2208 additions and 1107 deletions
@@ -175,6 +175,7 @@ pub fn main() {

            cfg.from_cflags("TOR_ZLIB_LIBS");
            cfg.from_cflags("TOR_LIB_MATH");
+            cfg.from_cflags("NSS_LIBS");
            cfg.from_cflags("TOR_OPENSSL_LIBS");
            cfg.from_cflags("TOR_LIBEVENT_LIBS");
            cfg.from_cflags("TOR_LIB_WS32");