Revert 240802 "Fix create_nmf.py on non-English locale."

Suspected to break ppapi/nacl glibc tests

> Fix create_nmf.py on non-English locale.
> 
> It would fail parsing localized string otherwise. For example 'file format' is
> 'format de fichier' with LANG=fr_CA.UTF-8.
> 
> Fix file_arch could be used before being assigned.
> 
> R=sbc@chromium.org
> BUG=
> 
> Review URL: https://codereview.chromium.org/108213002

TBR=maruel@chromium.org

Review URL: https://codereview.chromium.org/116193002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240860 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/native_client_sdk/src/tools/create_nmf.py b/native_client_sdk/src/tools/create_nmf.py
index 704b385..ea33a30 100755
--- a/native_client_sdk/src/tools/create_nmf.py
+++ b/native_client_sdk/src/tools/create_nmf.py
@@ -291,10 +291,8 @@ class NmfUtils(object):
 
     cmd = [self.objdump, '-p'] + list(full_paths)
     DebugPrint('GleanFromObjdump[%s](%s)' % (arch, cmd))
-    env = {'LANG': 'en_US.UTF-8'}
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE, bufsize=-1,
-                            env=env)
+                            stderr=subprocess.PIPE, bufsize=-1)
 
     input_info = {}
     found_basenames = set()
@@ -320,11 +318,11 @@ class NmfUtils(object):
             name=name,
             path=filename,
             url='/'.join(self.lib_prefix + [ARCH_LOCATION[file_arch], name]))
-        matched = NeededMatcher.match(line)
-        if matched:
-          match = '/'.join([file_arch, matched.group(1)])
-          needed.add(match)
-          Trace("NEEDED: %s" % match)
+      matched = NeededMatcher.match(line)
+      if matched:
+        match = '/'.join([file_arch, matched.group(1)])
+        needed.add(match)
+        Trace("NEEDED: %s" % match)
 
     for filename in files:
       if os.path.basename(filename) not in found_basenames: