From 08a6827b3df226560f5a4c4baa4daee2078be206 Mon Sep 17 00:00:00 2001 From: Stephen Hutchinson Date: Tue, 17 Jul 2018 20:49:01 -0400 Subject: wscript_build: apply project-wide CFLAGS/LDFLAGS to mpv.com mpv.com fails to build when cross-compiling with a multilib version of GCC, because the -m32 flags aren't getting passed to the build process for osdep/win32-console-wrapper.c or the link phase for mpv.com itself. --- wscript_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 8e948ba333..4d974fd9c3 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -611,8 +611,8 @@ def build(ctx): wrapctx.env.cprogram_PATTERN = "%s.com" wrapflags = ['-municode', '-mconsole'] - wrapctx.env.CFLAGS = wrapflags - wrapctx.env.LAST_LINKFLAGS = wrapflags + wrapctx.env.CFLAGS = ctx.env.CFLAGS + wrapflags + wrapctx.env.LAST_LINKFLAGS = ctx.env.LAST_LINKFLAGS + wrapflags if ctx.dependency_satisfied('test'): for test in ctx.path.ant_glob("test/*.c"): -- cgit v1.2.3