Bug 1414060 - move NONASCII to moz.configure; r=mshal
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Mon, 10 Sep 2018 18:57:40 -0400
changeset 435620 5ba9ea66286d9cb268c59c0bbdad4666c8df6378
parent 435619 4e39cac7e8d5bb08d8616678529baa5302afb39e
child 435621 be0107db18f7e9c300663e244cf03b77f67613c1
push id34616
push usercsabou@mozilla.com
push dateTue, 11 Sep 2018 10:07:11 +0000
treeherdermozilla-central@423bdf7a802b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1414060
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1414060 - move NONASCII to moz.configure; r=mshal
build/moz.configure/windows.configure
js/src/old-configure.in
old-configure.in
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -478,8 +478,12 @@ def alter_path(sdk_bin_path):
     path = os.pathsep.join(sdk_bin_path)
     os.environ['PATH'] = path
     return path
 
 
 set_config('PATH', alter_path)
 
 check_prog('MAKECAB', ('makecab.exe',))
+
+# Make sure that the build system can handle non-ASCII characters in
+# environment variables to prevent silent breakage on non-English systems.
+set_config('NONASCII', b'\241\241')
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1657,22 +1657,16 @@ else
     if ! test -e "$_CL_STDIO_PATH"; then
         AC_MSG_ERROR([Unable to parse cl -showIncludes prefix. This compiler's locale has an unsupported formatting.])
     fi
     if test -z "$CL_INCLUDES_PREFIX"; then
         AC_MSG_ERROR([Cannot find cl -showIncludes prefix.])
     fi
     AC_SUBST(CL_INCLUDES_PREFIX)
     rm -f dummy-hello.c
-
-    dnl Make sure that the build system can handle non-ASCII characters
-    dnl in environment variables to prevent it from breaking silently on
-    dnl non-English systems.
-    NONASCII=$'\241\241'
-    AC_SUBST(NONASCII)
   fi
 fi
 
 dnl ========================================================
 dnl = Link js shell to system readline
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(readline,
 [  --enable-readline       Link js shell to system readline library],
--- a/old-configure.in
+++ b/old-configure.in
@@ -3800,22 +3800,16 @@ else
     if ! test -e "$_CL_STDIO_PATH"; then
         AC_MSG_ERROR([Unable to parse cl -showIncludes prefix. This compiler's locale has an unsupported formatting.])
     fi
     if test -z "$CL_INCLUDES_PREFIX"; then
         AC_MSG_ERROR([Cannot find cl -showIncludes prefix.])
     fi
     AC_SUBST(CL_INCLUDES_PREFIX)
     rm -f dummy-hello.c
-
-    dnl Make sure that the build system can handle non-ASCII characters
-    dnl in environment variables to prevent it from breaking silently on
-    dnl non-English systems.
-    NONASCII=$'\241\241'
-    AC_SUBST(NONASCII)
   fi
 fi
 fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
 dnl =
 dnl = Static Build Options
 dnl =