fixes for macos build

Author: gmarzot

folly/python/setup.py

@@ -36,17 +36,21 @@
 # Define base libraries needed across all platforms
 base_libraries = ['folly', 'glog', 'double-conversion', 'fmt']
 
+LD_PATH = 'LD_LIBRARY_PATH'
 if sys.platform == 'darwin':
     from distutils import sysconfig
     cfg_vars = sysconfig.get_config_vars()
     for key in ('CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', 'PY_LDFLAGS', 'PY_CFLAGS', 'PY_CPPFLAGS'):
         if key in cfg_vars:
             cfg_vars[key] = cfg_vars[key].replace('-mmacosx-version-min=10.9', '-mmacosx-version-min=12')
+
     if platform.machine() == 'arm64':
         # Macos (arm64, homebrew path is different than intel)
         library_dirs = ['/opt/homebrew/lib']
     else:
         library_dirs = ['/usr/local/lib', '/usr/lib']
+
+    LD_PATH='DYLD_LIBRARY_PATH'
 else:
     # Debian/Ubuntu
     library_dirs = ['/usr/lib', '/usr/lib/x86_64-linux-gnu']
@@ -66,14 +70,14 @@
     os.environ['PYTHONPATH'] = pypath
 
 # Add (prepend) library paths from LD_LIBRARY_PATHs
-if ldpath := os.environ.get('LD_LIBRARY_PATH'):
+if ldpath := os.environ.get(LD_PATH):
     ldpaths = ldpath.split(':')
     library_dirs[:0] = ldpaths
     # make sure folly library path is included
     if folly_lib and folly_lib not in ldpaths:
-        print(f'export LD_LIBRARY_PATH="{folly_lib}:{ldpath}"\n')
+        print(f'export {LD_PATH}="{folly_lib}:{ldpath}"\n')
     else:
-        print(f'export LD_LIBRARY_PATH="{ldpath}"\n')
+        print(f'export {LD_PATH}="{ldpath}"\n')
 
 exts = [
     Extension(

folly/python/test/setup.py

@@ -14,25 +14,29 @@
 # Define base libraries needed across all platforms
 base_libraries = ['folly', 'glog', 'double-conversion', 'fmt']
 
+LD_PATH = 'LD_LIBRARY_PATH'
 if sys.platform == 'darwin':
     from distutils import sysconfig
     cfg_vars = sysconfig.get_config_vars()
     for key in ('CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', 'PY_LDFLAGS', 'PY_CFLAGS', 'PY_CPPFLAGS'):
         if key in cfg_vars:
             cfg_vars[key] = cfg_vars[key].replace('-mmacosx-version-min=10.9', '-mmacosx-version-min=12')
+    
     if platform.machine() == 'arm64':
         # Macos (arm64, homebrew path is different than intel)
         library_dirs = ['/opt/homebrew/lib']
     else:
         library_dirs = ['/usr/local/lib', '/usr/lib']
+
+    LD_PATH='DYLD_LIBRARY_PATH'
 else:
     # Debian/Ubuntu
     library_dirs = ['/usr/lib', '/usr/lib/x86_64-linux-gnu']
     # add libunwind explicitly
     base_libraries.append('unwind')
 
 # Add (prepend) library paths from LD_LIBRARY_PATHs and calculate include paths
-if ldpath := os.environ.get('LD_LIBRARY_PATH'):
+if ldpath := os.environ.get(LD_PATH):
     library_dirs[:0] = ldpath.split(':')
     include_dirs.extend(path for path in (re.sub(r'/lib$', '/include', p) for p in ldpath.split(':')))