commit 0586618453a279d14dbd6db7fdfaab37047ad39c
author David Benjamin <davidben@google.com> Sun Jan 29 18:25:06 2023 -0500
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Feb 07 18:53:21 2023 +0000
tree 5bc0dfbca72d2694a0c5d8eb28cc9e101e2c0432
parent d3d7d36151ce966ed132bfcb9e108fffa6d70535

Trim unnecessary -lrt and ws2_32 deps in the build.

The ws2_32 dependency comes from BIO, which is in libcrypto. Once it's
added there, it should get inherited by anything downstream, so we don't
need to keep listing it.

We also no longer need -lrt. We tried to remove it in
https://boringssl-review.googlesource.com/4622, but had to revert it in
https://boringssl-review.googlesource.com/4894 because of clock_gettime.

clock_gettime, per the Linux man page, is now in libc, not librt, as of
glibc 2.17. THat was released December 2012, well past our five year
watermark, so clean this part of the build up.

Change-Id: Ie6a07434b0cb02fe916b32ab8c326ec33d40bcb6
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/56606
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

crypto/CMakeLists.txt

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index ec6d2ee..45231bb 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -330,7 +330,7 @@
   add_dependencies(crypto bcm_o_target)
 endif()
 
-SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C)
+set_target_properties(crypto PROPERTIES LINKER_LANGUAGE C)
 
 if(WIN32)
   target_link_libraries(crypto ws2_32)
@@ -436,7 +436,4 @@
 add_dependencies(crypto_test global_target)
 
 target_link_libraries(crypto_test test_support_lib boringssl_gtest crypto)
-if(WIN32)
-  target_link_libraries(crypto_test ws2_32)
-endif()
 add_dependencies(all_tests crypto_test)

decrepit/CMakeLists.txt

diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
index 16985da..2c10f0e 100644
--- a/decrepit/CMakeLists.txt
+++ b/decrepit/CMakeLists.txt
@@ -43,7 +43,4 @@
 
 target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit
                       crypto)
-if(WIN32)
-  target_link_libraries(decrepit_test ws2_32)
-endif()
 add_dependencies(all_tests decrepit_test)

ssl/CMakeLists.txt

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index b4b1032..b558be4 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -69,7 +69,4 @@
 add_dependencies(ssl_test global_target)
 
 target_link_libraries(ssl_test test_support_lib boringssl_gtest ssl crypto)
-if(WIN32)
-  target_link_libraries(ssl_test ws2_32)
-endif()
 add_dependencies(all_tests ssl_test)

tool/CMakeLists.txt

diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index f98e96e..e84d229 100644
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -22,20 +22,5 @@
   transport_common.cc
 )
 install(TARGETS bssl DESTINATION ${CMAKE_INSTALL_BINDIR})
-
 add_dependencies(bssl global_target)
-
-if(WIN32)
-  target_link_libraries(bssl ws2_32)
-endif()
-
-if(APPLE OR WIN32 OR ANDROID)
-  target_link_libraries(bssl ssl crypto)
-else()
-  find_library(FOUND_LIBRT rt)
-  if(FOUND_LIBRT)
-    target_link_libraries(bssl ssl crypto -lrt)
-  else()
-    target_link_libraries(bssl ssl crypto)
-  endif()
-endif()
+target_link_libraries(bssl ssl crypto)

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index c221f04..9a62c83 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -550,7 +550,7 @@
 endif()
 
 if(WIN32)
-  target_link_libraries(bssl ws2_32)
+  target_link_libraries(crypto ws2_32)
 endif()
 
 ''')