diff options
| author | Akemi <der.richter@gmx.de> | 2018-06-08 23:03:28 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-06-12 01:54:45 +0300 |
| commit | 2e7a4f717c27251e95f2f50612035dc080c874be (patch) | |
| tree | a97c4559b859f4ea5551d4088a5821ab17339135 /wscript_build.py | |
| parent | 5865086aa84cae5e5505698ccf115a53a1b6b4fa (diff) | |
| download | mpv-2e7a4f717c27251e95f2f50612035dc080c874be.tar.bz2 mpv-2e7a4f717c27251e95f2f50612035dc080c874be.tar.xz | |
build: manually add standard library search paths for linking
this reverts commit a174566 since the actually reason for failing has
been found. the isysroot flag overwrites the framework and library
search paths. though we only need to overwrite the former and there is
no way to just overwrite that one. we manually add the standard library
search paths to the very end of the linking command, so it won't
interfere with the search paths extracted by waf.
Fixes #5791
Diffstat (limited to 'wscript_build.py')
| -rw-r--r-- | wscript_build.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/wscript_build.py b/wscript_build.py index 4b9b60e569..2c8b8c300b 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -154,13 +154,6 @@ def build(ctx): bridge, header, tgt, src) return task.exec_command(cmd) - if ctx.dependency_satisfied('cocoa') and ctx.env.MACOS_SDK: - # on macOS we explicitly need to set the SDK path, otherwise it can lead to - # linking warnings or errors - ctx.env.append_value('LINKFLAGS', [ - '-isysroot', ctx.env.MACOS_SDK - ]) - if ctx.dependency_satisfied('macos-cocoa-cb'): swift_source = [ ( "osdep/macOS_mpv_helper.swift" ), |