mirror of https://github.com/KLayout/klayout.git
Merge branch 'fix-macos-builds'
This commit is contained in:
commit
85c62e009d
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
cibuild: "*macosx*"
|
cibuild: "*macosx*"
|
||||||
cibw_arch: "macos_x86_64"
|
cibw_arch: "macos_x86_64"
|
||||||
macos-arch: "x86_64"
|
macos-arch: "x86_64"
|
||||||
- os: "macos-latest" # M1 runner
|
- os: "macos-14" # M1 runner
|
||||||
cibuild: "*macosx*"
|
cibuild: "*macosx*"
|
||||||
cibw_arch: "macos_arm64"
|
cibw_arch: "macos_arm64"
|
||||||
macos-arch: "arm64"
|
macos-arch: "arm64"
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -540,7 +540,7 @@ class Config(object):
|
||||||
"-Wl,-dylib",
|
"-Wl,-dylib",
|
||||||
"-Wl,-install_name,@rpath/%s" % self.libname_of(mod, is_lib=True),
|
"-Wl,-install_name,@rpath/%s" % self.libname_of(mod, is_lib=True),
|
||||||
]
|
]
|
||||||
args += ["-Wl,-rpath,@loader_path/"]
|
args += ["-Wl,-rpath,@loader_path/", "-Wl,-headerpad_max_install_names"]
|
||||||
args += options.get("ldflags-gcc", [])
|
args += options.get("ldflags-gcc", [])
|
||||||
args += options.get("ldflags-darwin", [])
|
args += options.get("ldflags-darwin", [])
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue