aboutsummaryrefslogtreecommitdiff
path: root/meson.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-07 00:37:14 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-10 00:57:09 +0200
commit4ef495c5969ac97fcb2887980fdf7e9cabbfc58a (patch)
tree6bf413d33a59fad8c3bf170808c5488c691d43f9 /meson.py
parent4c74b47cfdfa26661f649b7e8f7bbe0b88b13c6e (diff)
downloadmeson-4ef495c5969ac97fcb2887980fdf7e9cabbfc58a.zip
meson-4ef495c5969ac97fcb2887980fdf7e9cabbfc58a.tar.gz
meson-4ef495c5969ac97fcb2887980fdf7e9cabbfc58a.tar.bz2
Do not warn about non-utf8 locales on Windows.
Diffstat (limited to 'meson.py')
-rwxr-xr-xmeson.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.py b/meson.py
index 6dc5c7a..ca29d18 100755
--- a/meson.py
+++ b/meson.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from mesonbuild import mlog, mesonmain
+from mesonbuild import mlog, mesonmain, mesonlib
import sys, os, locale
def main():
@@ -23,7 +23,7 @@ def main():
# There is no way to reset both the preferred encoding and the filesystem
# encoding, so we can just warn about it.
e = locale.getpreferredencoding()
- if e.upper() != 'UTF-8':
+ if e.upper() != 'UTF-8' and not mesonlib.is_windows():
mlog.warning('You are using {!r} which is not a a Unicode-compatible '
'locale.'.format(e))
mlog.warning('You might see errors if you use UTF-8 strings as '