Merged singleexe branch.

1 files changed, 7 insertions, 7 deletions

diff --git a/meson.py b/meson.py
index ca29d18..d1b629d 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, mesonlib
+from mesonbuild import mesonmain, mesonlib
 import sys, os, locale
 
 def main():
@@ -24,14 +24,14 @@ def main():
     # encoding, so we can just warn about it.
     e = locale.getpreferredencoding()
     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 '
-                     'filenames, as strings, or as file contents.')
-        mlog.warning('Please switch to a UTF-8 locale for your platform.')
+        print('Warning: You are using {!r} which is not a a Unicode-compatible '
+              'locale.'.format(e), file=sys.stderr)
+        print('You might see errors if you use UTF-8 strings as '
+              'filenames, as strings, or as file contents.', file=sys.stderr)
+        print('Please switch to a UTF-8 locale for your platform.', file=sys.stderr)
     # Always resolve the command path so Ninja can find it for regen, tests, etc.
     launcher = os.path.realpath(sys.argv[0])
-    return mesonmain.run(launcher, sys.argv[1:])
+    return mesonmain.run(sys.argv[1:], launcher)
 
 if __name__ == '__main__':
     sys.exit(main())