zmike pushed a commit to branch efl-1.22. http://git.enlightenment.org/core/efl.git/commit/?id=96599425f12f058f2c51b316efdc585c8aa7c375
commit 96599425f12f058f2c51b316efdc585c8aa7c375 Author: Marcel Hollerbach <[email protected]> Date: Tue Apr 23 17:28:58 2019 +0200 meson: do not use the variable name env in mono env is used for the program env, and should not be used in any other form here. Reviewed-by: Xavi Artigas <[email protected]> Differential Revision: https://phab.enlightenment.org/D8690 --- src/tests/efl_mono/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build index f13b9a3b48..abd497c376 100644 --- a/src/tests/efl_mono/meson.build +++ b/src/tests/efl_mono/meson.build @@ -67,11 +67,11 @@ efl_mono_suite = executable('efl-mono-suite', cs_args : extra_cs_args ) -env = environment() -env.set('MONO_PATH', efl_mono_test_suite_path ) +env_mono = environment() +env_mono.set('MONO_PATH', efl_mono_test_suite_path ) if (cs_is_dotnet) -env.set('LD_LIBRARY_PATH', efl_mono_test_suite_path ) +env_mono.set('LD_LIBRARY_PATH', efl_mono_test_suite_path ) copy_prog = find_program(['cp', 'copy']) configure_file(input : 'efl-mono-suite.runtimeconfig.json', @@ -108,9 +108,9 @@ foreach config : config_libs load_lib += repaired_path+':' endforeach -env.set('LD_LIBRARY_PATH', load_lib) +env_mono.set('LD_LIBRARY_PATH', load_lib) test('efl-mono-suite', efl_mono_suite, - env : env + env : env_mono ) --
