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 <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D8690
This commit is contained in:
parent
af4c6df7bb
commit
e9c49d0f70
|
@ -67,11 +67,11 @@ efl_mono_suite = executable('efl-mono-suite',
|
||||||
cs_args : extra_cs_args
|
cs_args : extra_cs_args
|
||||||
)
|
)
|
||||||
|
|
||||||
env = environment()
|
env_mono = environment()
|
||||||
env.set('MONO_PATH', efl_mono_test_suite_path )
|
env_mono.set('MONO_PATH', efl_mono_test_suite_path )
|
||||||
|
|
||||||
if (cs_is_dotnet)
|
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'])
|
copy_prog = find_program(['cp', 'copy'])
|
||||||
|
|
||||||
configure_file(input : 'efl-mono-suite.runtimeconfig.json',
|
configure_file(input : 'efl-mono-suite.runtimeconfig.json',
|
||||||
|
@ -108,9 +108,9 @@ foreach config : config_libs
|
||||||
load_lib += repaired_path+':'
|
load_lib += repaired_path+':'
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
env.set('LD_LIBRARY_PATH', load_lib)
|
env_mono.set('LD_LIBRARY_PATH', load_lib)
|
||||||
|
|
||||||
test('efl-mono-suite',
|
test('efl-mono-suite',
|
||||||
efl_mono_suite,
|
efl_mono_suite,
|
||||||
env : env
|
env : env_mono
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue