build: only find env once
this was a bit messy, and we might have caused a bug on the ML with that.
This commit is contained in:
parent
f9ade56cf8
commit
e2a1cdfda7
|
@ -126,6 +126,8 @@ if sys_sun
|
||||||
add_global_arguments('-D_POSIX_PTHREAD_SEMANTICS', language: 'c')
|
add_global_arguments('-D_POSIX_PTHREAD_SEMANTICS', language: 'c')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
env = find_program('env', native: true)
|
||||||
|
|
||||||
config_h = configuration_data()
|
config_h = configuration_data()
|
||||||
config_h.set_quoted('MODULE_ARCH', version_name)
|
config_h.set_quoted('MODULE_ARCH', version_name)
|
||||||
config_h.set_quoted('PACKAGE', meson.project_name())
|
config_h.set_quoted('PACKAGE', meson.project_name())
|
||||||
|
|
|
@ -45,7 +45,6 @@ else
|
||||||
if sys_windows == true
|
if sys_windows == true
|
||||||
edje_cc_exe = [edje_cc.full_path()]
|
edje_cc_exe = [edje_cc.full_path()]
|
||||||
else
|
else
|
||||||
env = find_program('env', native: true)
|
|
||||||
edje_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
|
edje_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
|
||||||
endif
|
endif
|
||||||
edje_depends = [edje_cc, epp, evas_engine_buffer_mod, embryo_cc]
|
edje_depends = [edje_cc, epp, evas_engine_buffer_mod, embryo_cc]
|
||||||
|
@ -98,7 +97,6 @@ if meson.is_cross_build()
|
||||||
edje_codegen_path = _edje_codegen.path()
|
edje_codegen_path = _edje_codegen.path()
|
||||||
edje_codegen_exe = [_edje_codegen]
|
edje_codegen_exe = [_edje_codegen]
|
||||||
else
|
else
|
||||||
env = find_program('env', native: true)
|
|
||||||
edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen.full_path()]
|
edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen.full_path()]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -234,7 +234,6 @@ endif
|
||||||
if meson.is_cross_build()
|
if meson.is_cross_build()
|
||||||
elementary_codegen_exe = [find_program('elementary_codegen', native: true)]
|
elementary_codegen_exe = [find_program('elementary_codegen', native: true)]
|
||||||
else
|
else
|
||||||
env = find_program('env', native: true)
|
|
||||||
elementary_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elementary_codegen.full_path()]
|
elementary_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elementary_codegen.full_path()]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -260,7 +259,6 @@ if meson.is_cross_build()
|
||||||
elm_prefs_cc_path = _elm_prefs_cc.path()
|
elm_prefs_cc_path = _elm_prefs_cc.path()
|
||||||
elm_prefs_cc_exe = [_elm_prefs_cc]
|
elm_prefs_cc_exe = [_elm_prefs_cc]
|
||||||
else
|
else
|
||||||
env = find_program('env', native: true)
|
|
||||||
elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()]
|
elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue