summaryrefslogtreecommitdiff
path: root/src/bin
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 /src/bin
parentfc831ede97c541befa73e7019439b1b1b695828c (diff)
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
Diffstat (limited to 'src/bin')
-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()
36 edje_cc_exe = [_edje_cc] 36 edje_cc_exe = [_edje_cc]
37 edje_depends = [] 37 edje_depends = []
38else 38else
39 env = find_program('env', native: true) 39 if sys_windows == true
40 edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()] 40 edje_cc_exe = [edje_cc.full_path()]
41 else
42 env = find_program('env', native: true)
43 edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
44 endif
41 edje_depends = [edje_cc, epp] 45 edje_depends = [edje_cc, epp]
42endif 46endif
43 47