summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hutchinson <qyot27@gmail.com>2018-07-17 20:49:01 -0400
committerJan Ekström <jeebjp@gmail.com>2018-07-19 02:38:51 +0300
commit08a6827b3df226560f5a4c4baa4daee2078be206 (patch)
tree4355df2bbe5179f7131dd39d49662d55f59967b0
parent2f7dc16995f655aa35fbb0dba8098a800911b53e (diff)
downloadmpv-08a6827b3df226560f5a4c4baa4daee2078be206.tar.bz2
mpv-08a6827b3df226560f5a4c4baa4daee2078be206.tar.xz
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.
-rw-r--r--wscript_build.py4
1 files changed, 2 insertions, 2 deletions
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"):