summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-09-01 12:22:59 -0700
committerAdam Jackson <ajax@redhat.com>2017-09-13 11:14:57 -0400
commit5abaa50b292798370a665ace5eec56fd830be226 (patch)
tree7c26a03317a10bc2699c574eb533ee86c2934e46
parent05e7e8b587dd9d37e8beadc72ab993f028c47fa1 (diff)
meson: Move the BUILD_DATE/TIME setup to configure time.
By having it as a custom_target with build_always, every "ninja -C build" would rebuild Xorg for the new date/time, even if the rest of Xorg didn't change. We could build the rest of Xorg into a static lib, and regenerate date/time when the static lib changes and link that into a final Xorg, but BUILD_DATE/TIME is such a dubious feature (compared to including a git sha, which is easy with meson) it doesn't seem worth the build time cost. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/xfree86/common/meson.build6
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index 6ed3f5124..e734b3ce2 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -65,11 +65,9 @@ if get_option('pciaccess')
srcs_xorg_common += ['xf86pciBus.c', 'xf86VGAarbiter.c']
endif
-srcs_xorg_common += custom_target(
- 'xf86Build.h',
+srcs_xorg_common += configure_file(
output: 'xf86Build.h',
- command: [join_paths(meson.current_source_dir(), 'xf86Build.sh'), '@OUTPUT@'],
- build_always: true,
+ command: ['sh', join_paths(meson.current_source_dir(), 'xf86Build.sh'), '@OUTPUT@'],
)
srcs_xorg_common += custom_target(