summaryrefslogtreecommitdiff
path: root/src/bin/edje
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-04 20:33:07 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-07 13:05:31 +0100
commit79ded15ad3c0074e1d378cc5a0accad2399fcc24 (patch)
tree4c41f5e2e2af30763f2ea240a5ef1c4ac14df0be /src/bin/edje
parent4a196b99d5371ec7b43a1c166436e469bd83e57c (diff)
meson: enable cross compiling
the inital work for this commit was coming from `Mark van der Putten`. In order to not have more options for this, the idea came up to use mesons autodetection using PATH. If a cross file is specified, the binaries are used from the system, rather than from the intree. (Which means --cross-file has the dependency of efl on the buildsystem) Differential Revision: https://phab.enlightenment.org/D7415
Diffstat (limited to 'src/bin/edje')
-rw-r--r--src/bin/edje/meson.build11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 83e4cbbde3..24d62ead62 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -30,9 +30,14 @@ edje_cc = executable('edje_cc',
30 link_args : bin_linker_args 30 link_args : bin_linker_args
31) 31)
32 32
33env = find_program('env') 33if meson.is_cross_build()
34 34 _edje_cc = find_program('edje_cc', native: true)
35edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()] 35 edje_cc_path = _edje_cc.path()
36 edje_cc_exe = [_edje_cc]
37else
38 env = find_program('env', native: true)
39 edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
40endif
36 41
37edje_decc_src = [ 42edje_decc_src = [
38 'edje_decc.c', 43 'edje_decc.c',