Alternative visibility fix

Author: tadeja

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -2448,6 +2448,12 @@ macro(build_substrait)
 
   add_library(substrait STATIC ${SUBSTRAIT_SOURCES})
   set_target_properties(substrait PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    # Match Protobuf's visibility so duplicate inline definitions can't be
+    # selected with different visibility when linking a side module (GH-50774)
+    set_target_properties(substrait PROPERTIES CXX_VISIBILITY_PRESET hidden
+                                               VISIBILITY_INLINES_HIDDEN ON)
+  endif()
   target_compile_options(substrait PRIVATE "${SUBSTRAIT_SUPPRESSED_FLAGS}")
   target_include_directories(substrait PUBLIC ${SUBSTRAIT_INCLUDES})
   target_link_libraries(substrait PUBLIC ${ARROW_PROTOBUF_LIBPROTOBUF})
@@ -3888,6 +3894,12 @@ function(build_orc)
 
     fetchcontent_makeavailable(orc)
 
+    if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+      # ORC compiles generated Protobuf code into its static library
+      set_target_properties(orc PROPERTIES CXX_VISIBILITY_PRESET hidden
+                                           VISIBILITY_INLINES_HIDDEN ON)
+    endif()
+
     # ORC 2.2.1 unconditionally adds /std:c++17 on MSVC via
     # add_compile_options, which overrides CMAKE_CXX_STANDARD and causes
     # ABI mismatches with protobuf (GlobalEmptyStringConstexpr vs
@@ -3980,6 +3992,10 @@ function(build_orc)
         "-DZLIB_HOME=${ORC_ZLIB_ROOT}"
         "-DZLIB_INCLUDE_DIR=$<TARGET_PROPERTY:ZLIB::ZLIB,INTERFACE_INCLUDE_DIRECTORIES>"
         "-DZLIB_LIBRARY=$<TARGET_FILE:ZLIB::ZLIB>")
+    if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+      list(APPEND ORC_CMAKE_ARGS -DCMAKE_CXX_VISIBILITY_PRESET=hidden
+           -DCMAKE_VISIBILITY_INLINES_HIDDEN=ON)
+    endif()
 
     # Work around CMake bug
     file(MAKE_DIRECTORY ${ORC_INCLUDE_DIR})

cpp/src/arrow/CMakeLists.txt

@@ -1106,11 +1106,6 @@ else()
 endif()
 
 if(ARROW_BUILD_BUNDLED_DEPENDENCIES)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
-    # Restore the archive order (pre-GH-50650). Otherwise, wasm-ld may select
-    # duplicate vague-linkage symbols from a different member (GH-50774).
-    list(REVERSE ARROW_BUNDLED_STATIC_LIBS)
-  endif()
   arrow_car(_FIRST_LIB ${ARROW_BUNDLED_STATIC_LIBS})
   arrow_cdr(_OTHER_LIBS ${ARROW_BUNDLED_STATIC_LIBS})
   arrow_create_merged_static_lib(arrow_bundled_dependencies