From 2d414a30bf7f99f3e2e73b05fdd68abeafbf6482 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 2 Apr 2021 22:23:45 +0300
Subject: Drop using redundant libcurl-symbols.expsym file

---
 libcurl/libcurl/buildfile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'libcurl/libcurl/buildfile')

diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile
index 2245b83..d44293f 100644
--- a/libcurl/libcurl/buildfile
+++ b/libcurl/libcurl/buildfile
@@ -6,11 +6,6 @@
 define vsc: file
 vsc{*}: extension = vers
 
-# Exported symbols.
-#
-define esm: file
-esm{*}: extension = expsym
-
 import imp_libs  = libssl%lib{ssl}
 import imp_libs += libcrypto%lib{crypto}
 import imp_libs += libz%lib{z}
@@ -25,8 +20,7 @@ bsd     = ($tclass == 'bsd')
 macos   = ($tclass == 'macos')
 windows = ($tclass == 'windows')
 
-libs{curl}: vsc{libcurl}:         include = ($linux || $bsd ? adhoc : false)
-libs{curl}: esm{libcurl-symbols}: include = ($macos         ? adhoc : false)
+libs{curl}: vsc{libcurl}: include = ($linux || $bsd ? adhoc : false)
 
 vsc{libcurl}: lib/in{libcurl}
 {
@@ -95,8 +89,13 @@ switch $tclass, $tsys
   }
   case 'macos'
   {
-    c.loptions += "-Wl,-exported_symbols_list,$src_base/libcurl-symbols.expsym"
-    c.libs     += -framework CoreFoundation -framework Security
+    # Note that upstream generates the libcurl-symbols.expsym file on MacOS
+    # and passes it to linker via the -exported_symbols_list option. This
+    # looks redundant, since the __visibility__("default") attribute is also
+    # used for the API function declarations. Thus, we don't bother
+    # generating/passing the exported symbol list file.
+    #
+    c.libs += -framework CoreFoundation -framework Security
   }
   case 'windows', 'mingw32'
   {
-- 
cgit v1.1