diff options
| author | Lyude Paul <lyude@redhat.com> | 2017-10-23 16:21:19 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-10-24 10:53:56 -0400 |
| commit | 4d53e30651c0fe5f7be38ae8529fa49846d39549 (patch) | |
| tree | 503d9533bbfc4beeedec3875a1951465bde38c85 /hw/dmx | |
| parent | 5893e72a20ffa5cfcd6d0c7c5c934b92546d76c3 (diff) | |
meson: Don't use '' in link_with, ever
String arguments as elements in the array passed to the link_with
argument in meson's executable() functions are not valid and will end up
causing the build file generation to file. This actually ended up
exposing a bug in meson that caused it not to report where in the
meson.build file it was failing:
https://github.com/mesonbuild/meson/pull/2527
The proper way to have a variable that can contain either an empty link
target or an actual link target is:
some_target = []
if some_cond
some_target = static_library(...)
endif
This way if some_cond is False, some_target gets set to [], gets passed
to executable() in the link_with array, and then gets removed by array
flattening.
This also unbreaks Xwayland builds with -Dglx=false, the thing that
originally made me notice this.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/dmx/meson.build b/hw/dmx/meson.build index bc693c1c9..f2da0c27b 100644 --- a/hw/dmx/meson.build +++ b/hw/dmx/meson.build @@ -43,7 +43,7 @@ dmx_dep = [ dl_dep, ] -dmx_glx = '' +dmx_glx = [] if build_glx srcs += 'dmx_glxvisuals.c' subdir('glxProxy') |