summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-24 14:22:45 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-24 14:31:14 +0100
commit38b7eede1e7ebf0a0699d135611828c6d62ede6f (patch)
treeb76cb6a97ee93b4445206d9b4884ab12c57803a7 /wscript
parent806b410c6a7db0d6d56145d3cc9381273163cc9a (diff)
downloadmpv-38b7eede1e7ebf0a0699d135611828c6d62ede6f.tar.bz2
mpv-38b7eede1e7ebf0a0699d135611828c6d62ede6f.tar.xz
build: store dependencies as lists
In Python sets are unordered, so iterating them after converting to a list always leads to different results. The code iterated on them to collect all the flags to pass to the compiler, and since the order of the flags changed, waf would rebuild all of the C files. Seems like in Python 2 this worked as expected by pure chance. This commit stores the sets as lists, and converts them to sets when the set operations are needed. Fixes #363
Diffstat (limited to 'wscript')
-rw-r--r--wscript3
1 files changed, 3 insertions, 0 deletions
diff --git a/wscript b/wscript
index dd46d0c513..dabf630875 100644
--- a/wscript
+++ b/wscript
@@ -755,5 +755,8 @@ def configure(ctx):
if not ctx.dependency_satisfied('build-date'):
ctx.env.CFLAGS += ['-DNO_BUILD_TIMESTAMPS']
+ ctx.store_dependencies_lists()
+
def build(ctx):
+ ctx.unpack_dependencies_lists()
ctx.load('wscript_build')