summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-09-02 09:25:51 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-09-02 09:25:51 +0200
commite2a1cdfda76dd0061ef8e0ab25aee4e042304366 (patch)
treec79d238fb76828a0282ca521f292e31db44367b2
parentf9ade56cf8de4f040572f368da644f2a83bdee92 (diff)
build: only find env once
this was a bit messy, and we might have caused a bug on the ML with that.
-rw-r--r--meson.build2
-rw-r--r--src/bin/edje/meson.build2
-rw-r--r--src/bin/elementary/meson.build2
3 files changed, 2 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index c7af80917f..ba34a9c311 100644
--- a/meson.build
+++ b/meson.build
@@ -126,6 +126,8 @@ if sys_sun
126 add_global_arguments('-D_POSIX_PTHREAD_SEMANTICS', language: 'c') 126 add_global_arguments('-D_POSIX_PTHREAD_SEMANTICS', language: 'c')
127endif 127endif
128 128
129env = find_program('env', native: true)
130
129config_h = configuration_data() 131config_h = configuration_data()
130config_h.set_quoted('MODULE_ARCH', version_name) 132config_h.set_quoted('MODULE_ARCH', version_name)
131config_h.set_quoted('PACKAGE', meson.project_name()) 133config_h.set_quoted('PACKAGE', meson.project_name())
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 82d51c7a77..e715571852 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -45,7 +45,6 @@ else
45 if sys_windows == true 45 if sys_windows == true
46 edje_cc_exe = [edje_cc.full_path()] 46 edje_cc_exe = [edje_cc.full_path()]
47 else 47 else
48 env = find_program('env', native: true)
49 edje_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()] 48 edje_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
50 endif 49 endif
51 edje_depends = [edje_cc, epp, evas_engine_buffer_mod, embryo_cc] 50 edje_depends = [edje_cc, epp, evas_engine_buffer_mod, embryo_cc]
@@ -98,7 +97,6 @@ if meson.is_cross_build()
98 edje_codegen_path = _edje_codegen.path() 97 edje_codegen_path = _edje_codegen.path()
99 edje_codegen_exe = [_edje_codegen] 98 edje_codegen_exe = [_edje_codegen]
100else 99else
101 env = find_program('env', native: true)
102 edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen.full_path()] 100 edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen.full_path()]
103endif 101endif
104 102
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index f31ed793e3..1d7aa75057 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -234,7 +234,6 @@ endif
234if meson.is_cross_build() 234if meson.is_cross_build()
235 elementary_codegen_exe = [find_program('elementary_codegen', native: true)] 235 elementary_codegen_exe = [find_program('elementary_codegen', native: true)]
236else 236else
237 env = find_program('env', native: true)
238 elementary_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elementary_codegen.full_path()] 237 elementary_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elementary_codegen.full_path()]
239endif 238endif
240 239
@@ -260,7 +259,6 @@ if meson.is_cross_build()
260 elm_prefs_cc_path = _elm_prefs_cc.path() 259 elm_prefs_cc_path = _elm_prefs_cc.path()
261 elm_prefs_cc_exe = [_elm_prefs_cc] 260 elm_prefs_cc_exe = [_elm_prefs_cc]
262else 261else
263 env = find_program('env', native: true)
264 elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()] 262 elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()]
265endif 263endif
266 264