summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-05 00:20:31 +0200
committerwm4 <wm4@nowhere>2014-08-05 00:20:31 +0200
commit91fbaa7d34c96458dcc691960ca7cff89b4ccf37 (patch)
treeac55364eb1ace3e74ab002bddb0fd33ed1deda3c
parentd634f7b01a255b22962b0b44f20f052cfc34b240 (diff)
downloadmpv-91fbaa7d34c96458dcc691960ca7cff89b4ccf37.tar.bz2
mpv-91fbaa7d34c96458dcc691960ca7cff89b4ccf37.tar.xz
build: fix cross-compilation of libmpv
libmpv requires nm for creating the list of exported symbols (this is done in syms.py). We should probably just make this list static instead, but since this involves platform-specific code, for now this quick-fix will do.
-rw-r--r--wscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/wscript b/wscript
index 2c82eac3e2..23cac828f8 100644
--- a/wscript
+++ b/wscript
@@ -789,12 +789,13 @@ def is_debug_build(ctx):
def configure(ctx):
ctx.check_waf_version(mini='1.7.15')
target = os.environ.get('TARGET')
- (cc, pkg_config, windres) = ('cc', 'pkg-config', 'windres')
+ (cc, pkg_config, windres, nm) = ('cc', 'pkg-config', 'windres', 'nm')
if target:
cc = '-'.join([target, 'gcc'])
pkg_config = '-'.join([target, pkg_config])
windres = '-'.join([target, windres])
+ nm = '-'.join([target, nm])
ctx.find_program(cc, var='CC')
ctx.find_program(pkg_config, var='PKG_CONFIG')
@@ -802,6 +803,7 @@ def configure(ctx):
ctx.find_program('rst2man', var='RST2MAN', mandatory=False)
ctx.find_program('rst2pdf', var='RST2PDF', mandatory=False)
ctx.find_program(windres, var='WINDRES', mandatory=False)
+ ctx.find_program(nm, var='NM', mandatory=False)
for ident, _, _ in _INSTALL_DIRS_LIST:
varname = ident.upper()