Changeset 5133


Ignore:
Timestamp:
Jan 9, 2022 6:39:00 PM (7 months ago)
Author:
toby
Message:

deal with .so files not working in upgraded OS on M1 Mac

Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/AllBinaries/emptydir.txt

    r4731 r5133  
    11This directory is intended as a potential home for all GSAS-II binaries, copied over
    2 from the GSAS-II svn server when the bootstrap.py -server switch is used.
     2from the GSAS-II svn server when the bootstrap.py -server switch is
     3used with this command:
    34
    4 This file also keeps this directory from being removed in the packaging process.
     5     svn switch https://subversion.xray.aps.anl.gov/pyGSAS/Binaries AllBinaries --ignore-ancestry
     6
     7This file also keeps this directory from being removed in the
     8conda packaging process which seems to not include empty directories
  • trunk/fsource/SConstruct

    r5132 r5133  
    1111import glob
    1212import subprocess
    13 import numpy as np
    1413#==========================================================================================
    1514def is_exe(fpath):
     
    129128      sys.exit()
    130129elif sys.platform == "darwin":
    131     LDFLAGS = '-undefined dynamic_lookup -bundle'
    132     SDKROOT = os.environ['SDKROOT']
     130    if 'arm' in platform.machine():
     131        LDFLAGS = '-undefined dynamic_lookup -bundle -rpath ./ -mmacosx-version-min=11.1'
     132        # I am not sure I completely understand the -rpath & -mmacosx-version-min options,
     133        # but thet seem to work; this probably needs to be tested more
     134    else:
     135        LDFLAGS = '-undefined dynamic_lookup -bundle'
     136    SDKROOT = os.environ.get('SDKROOT','')
    133137    F2PYsuffix = '.so'
    134138elif sys.platform.startswith("linux"):
Note: See TracChangeset for help on using the changeset viewer.