From df8d634fa6318bd080720d8dbc774984aac3344c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 Apr 2019 09:04:25 -0400 Subject: [PATCH] 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 Differential Revision: https://phab.enlightenment.org/D8724 --- src/bin/edje/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build index b2f2e73..5ba05d7 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 -- 2.7.4