From 562edb5a613a40baead66466ef571eabe8954c03 Mon Sep 17 00:00:00 2001
From: Alex Kasko <alex@staticlibs.net>
Date: Tue, 16 Sep 2025 12:34:50 +0100
Subject: [PATCH] Fix exported symbols on Mac

This PR is a follow-up to #164 change, it fixes the exported symbols for
MacOS and adds listing of symbols on CI runs.
---
 .github/workflows/Java.yml | 25 +++++++++++++++++++++++++
 CMakeLists.txt             |  2 +-
 CMakeLists.txt.in          |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
index 08c9a17a8..a00e5176c 100644
--- a/.github/workflows/Java.yml
+++ b/.github/workflows/Java.yml
@@ -72,6 +72,10 @@ jobs:
             make -C /duckdb release
           "
 
+      - name: List Symbols
+        run: |
+          nm -gU ./build/release/libduckdb_java.so_linux_amd64
+
       - name: JDBC Tests EL8
         if: ${{ inputs.skip_tests != 'true' }}
         run: |
@@ -218,6 +222,9 @@ jobs:
             source /opt/rh/gcc-toolset-12/enable
             make -C /duckdb release
           "
+      - name: List Symbols
+        run: |
+          nm -gU ./build/release/libduckdb_java.so_linux_arm64
 
       - name: JDBC Tests EL8
         shell: bash
@@ -283,6 +290,10 @@ jobs:
           ${{ env.ALPINE_IMAGE }}                  \
           sh -c 'apk add ${{ env.ALPINE_PACKAGES }} && make -C /duckdb release'
 
+      - name: List Symbols
+        run: |
+          nm -gU ./build/release/libduckdb_java.so_linux_amd64
+
       - name: JDBC Tests
         shell: bash
         if: ${{ inputs.skip_tests != 'true' }}
@@ -328,6 +339,10 @@ jobs:
           ${{ env.ALPINE_IMAGE }}                  \
           sh -c 'apk add ${{ env.ALPINE_PACKAGES }} && make -C /duckdb release'
 
+      - name: List Symbols
+        run: |
+          nm -gU ./build/release/libduckdb_java.so_linux_arm64
+
       # Test runs are failing because of linux_arm64_musl extensions missing
       - name: JDBC Tests
         shell: bash
@@ -370,6 +385,12 @@ jobs:
         shell: bash
         run: make release
 
+      - name: List Symbols
+        shell: cmd
+        run: |
+          call "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          dumpbin.exe /exports build\release\Release\libduckdb_java.so_windows_amd64
+
       - name: Java Tests
         if: ${{ inputs.skip_tests != 'true' }}
         shell: bash
@@ -404,6 +425,10 @@ jobs:
         shell: bash
         run: make release
 
+      - name: List Symbols
+        run: |
+          nm -gU ./build/release/libduckdb_java.so_osx_universal
+
       - name: Java Tests
         if: ${{ inputs.skip_tests != 'true' }}
         shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54c86f482..dd8af71b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -638,7 +638,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     -Bsymbolic-functions
     -fvisibility=hidden 
     -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/duckdb_java.map)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
   target_link_options(duckdb_java PRIVATE
     -fvisibility=hidden
     -Wl,-exported_symbols_list,${CMAKE_CURRENT_LIST_DIR}/duckdb_java.exp)
diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index 807d16216..7fa94f5b3 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -164,7 +164,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     -Bsymbolic-functions
     -fvisibility=hidden 
     -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/duckdb_java.map)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
   target_link_options(duckdb_java PRIVATE
     -fvisibility=hidden
     -Wl,-exported_symbols_list,${CMAKE_CURRENT_LIST_DIR}/duckdb_java.exp)