Update vendoring script and Package.swift

apple · Dec 13, 2024 · 3564652 · 3564652
1 parent dc4c2c1
commit 3564652
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Package.swift b/Package.swift
@@ -98,9 +98,9 @@ let package = Package(
                  * These files are excluded to support WASI libc which doesn't provide <netdb.h>.
                  * This is safe for all platforms as we do not rely on networking features.
                  */
-                "crypto/bio/connect.c",
-                "crypto/bio/socket_helper.c",
-                "crypto/bio/socket.c"
+                "crypto/bio/connect.cc",
+                "crypto/bio/socket_helper.cc",
+                "crypto/bio/socket.cc"
             ],
             resources: privacyManifestResource,
             cSettings: [

diff --git a/scripts/vendor-boringssl.sh b/scripts/vendor-boringssl.sh
@@ -113,8 +113,9 @@ function mangle_symbols {
             go run "util/read_symbols.go" -obj-file-format elf -out "${TMPDIR}/symbols-linux-all.txt" "${HERE}"/.build/*-unknown-linux-gnu/debug/libCCryptoBoringSSL.a
         )
 
-        # Now we concatenate all the symbols together and uniquify it.
-        cat "${TMPDIR}"/symbols-*.txt | sort | uniq > "${TMPDIR}/symbols.txt"
+        # Now we concatenate all the symbols together and uniquify it. At this stage remove anything that
+        # already has CCryptoBoringSSL in it, as those are namespaced by nature.
+        cat "${TMPDIR}"/symbols-*.txt | sort | uniq | grep -v "CCryptoBoringSSL" > "${TMPDIR}/symbols.txt"
 
         # Use this as the input to the mangle.
         (