diff options
| author | Nils Philippsen <nils@tiptoe.de> | 2015-11-23 13:52:14 +0100 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-11-23 08:43:19 -0500 |
| commit | e25ddc39f86f69e2e12cb679dff82a0c5068cc23 (patch) | |
| tree | f62685aa3d0ab3542022408082939dc69d503170 /gtk2_ardour | |
| parent | 4d599b3da1ff8fa5fa172be32fbd14d0ba25b915 (diff) | |
make copies of global lists before extending
Not doing so can make source or object files appear multiple times in
the list of files to be compiled or linked, e.g. when doing './waf build
install', subsequently leading to linker errors.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/wscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 34bf3f04eb..e58c50c1a8 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -422,7 +422,8 @@ def build(bld): # now the shared library containing the GTK GUI for ardour obj = bld (features = 'cxx c cxxshlib') - obj.source = gtk2_ardour_sources + # operate on copy to avoid adding sources twice + obj.source = list(gtk2_ardour_sources) obj.includes = [ '../libs/fst', '.' ] obj.name = 'libgtk2_ardour' obj.target = 'gtk2_ardour' @@ -433,7 +434,8 @@ def build(bld): obj = bld (features = 'cxx c cxxprogram winres') else: obj = bld (features = 'cxx c cxxprogram') - obj.source = gtk2_ardour_sources + # operate on copy to avoid adding sources twice + obj.source = list(gtk2_ardour_sources) obj.target = 'ardour-' + str (bld.env['VERSION']) obj.includes = ['.'] obj.ldflags = ['-no-undefined'] |