[gjs/meson.msvc: 2/3] meson.build: Don't run build/choose-tests-locale.sh
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/meson.msvc: 2/3] meson.build: Don't run build/choose-tests-locale.sh
- Date: Tue, 29 Oct 2019 10:00:31 +0000 (UTC)
commit 172b9bdbd616700f02dd6c6510068965a20f48d1
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Oct 25 12:38:12 2019 +0800
meson.build: Don't run build/choose-tests-locale.sh
This is not applicable for MSVC builds, as MSVC builds are done in a
standard Windows cmd.exe console, not a BASH-style console.
Instead, just set LC_ALL to C.UTF-8 for MSVC builds.
meson.build | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 678f94fb..c425fb49 100644
--- a/meson.build
+++ b/meson.build
@@ -299,7 +299,12 @@ configure_file(input: 'win32/config.h.win32.in', output: 'config.h.win32',
### Check for environment ######################################################
-tests_locale = run_command('build/choose-tests-locale.sh').stdout().strip()
+if cxx.get_id() == 'msvc'
+ tests_locale = 'C.UTF-8'
+else
+ # Not applicable for cmd.exe shells that MSVC uses
+ tests_locale = run_command('build/choose-tests-locale.sh').stdout().strip()
+endif
gjsjsdir = get_option('datadir') / api_name
pkglibexecdir = get_option('libexecdir') / meson.project_name()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]