Changeset 5132


Ignore:
Timestamp:
Jan 9, 2022 11:43:38 AM (7 months ago)
Author:
toby
Message:

correct M1 Mac bin path name

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpath.py

    r5129 r5132  
    798798        print(u'Unknown platform: '+sys.platform)
    799799        raise Exception('Unknown platform')
    800     if 'aarch' in platform.machine() and platform.architecture()[0] == '64bit':
     800    if 'arm' in platform.machine() and sys.platform == "darwin":
     801        bits = 'arm'
     802    elif 'aarch' in platform.machine() and '64' in platform.architecture()[0]:
    801803        bits = 'arm64'
    802804    elif 'arm' in platform.machine():
    803805        bits = 'arm32'
    804     elif platform.architecture()[0] == '64bit':
     806    elif '64' in platform.architecture()[0]:
    805807        bits = '64'
    806808    else:
  • trunk/fsource/SConstruct

    r5129 r5132  
    4444        print(u'Unknown platform: '+sys.platform)
    4545        raise Exception('Unknown platform')
    46     if 'aarch' in platform.machine() and platform.architecture()[0] == '64bit':
     46    if 'arm' in platform.machine() and sys.platform == "darwin":
     47        bits = 'arm'
     48    elif 'aarch' in platform.machine() and '64' in platform.architecture()[0]:
    4749        bits = 'arm64'
    4850    elif 'arm' in platform.machine():
    4951        bits = 'arm32'
    50     elif platform.architecture()[0] == '64bit':
     52    elif '64' in platform.architecture()[0]:
    5153        bits = '64'
    5254    else:
Note: See TracChangeset for help on using the changeset viewer.