aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-04-26 09:04:25 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-05-06 17:00:47 +0200
commit18ce3e8066f954bd32f2ba890e308def86c6a668 (patch)
tree7711c4749ea9a6f35ba73b357862e1e4b5bfc90f
parentmeson: don't add / after DESTDIR in install scripts (diff)
downloadefl-18ce3e8066f954bd32f2ba890e308def86c6a668.tar.gz
meson: don't run edje_cc in tree using `env`
this breaks library path setup in the build: the dependencies for runtime are set for the 'env' executable instead of for edje_cc for now, EFL_RUN_IN_TREE must be set manually Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D8724
-rw-r--r--src/bin/edje/meson.build8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index b2f2e738b1..5ba05d7c63 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -36,8 +36,12 @@ if meson.is_cross_build()
edje_cc_exe = [_edje_cc]
edje_depends = []
else
- env = find_program('env', native: true)
- edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
+ if sys_windows == true
+ edje_cc_exe = [edje_cc.full_path()]
+ else
+ env = find_program('env', native: true)
+ edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
+ endif
edje_depends = [edje_cc, epp]
endif