File gcc50-fixes.diff of Package chromium

Overview Repositories Revisions Requests Users Attributes Meta

File gcc50-fixes.diff of Package chromium (Revision 9d45cbe54ce7ad1824c8ade4358a8ae8)

Currently displaying revision 9d45cbe54ce7ad1824c8ade4358a8ae8 , Show latest

--- build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
+++ build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
@@ -56,7 +56,7 @@
     if tool == "compiler":
       compiler = compiler + " -dumpversion"
       # 4.6
-      version_re = re.compile(r"(\d+)\.(\d+)")
+      version_re = re.compile(r"(\d+)")
     elif tool == "assembler":
       compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
       # Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@
       raise subprocess.CalledProcessError(pipe.returncode, compiler)
 
     parsed_output = version_re.match(tool_output)
-    result = parsed_output.group(1) + parsed_output.group(2)
+    if tool == "compiler":
+      result = parsed_output.group(1) + "1"
+    else:
+      result = parsed_output.group(1) + parsed_output.group(2)
+
     compiler_version_cache[cache_key] = result
     return result
   except Exception, e:
--- native_client/build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
+++ native_client/build/compiler_version.py	2015-06-17 21:51:42.871082412 +0200
@@ -56,7 +56,7 @@
     if tool == "compiler":
       compiler = compiler + " -dumpversion"
       # 4.6
-      version_re = re.compile(r"(\d+)\.(\d+)")
+      version_re = re.compile(r"(\d+)")
     elif tool == "assembler":
       compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
       # Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@
       raise subprocess.CalledProcessError(pipe.returncode, compiler)
 
     parsed_output = version_re.match(tool_output)
-    result = parsed_output.group(1) + parsed_output.group(2)
+    if tool == "compiler":
+      result = parsed_output.group(1) + "1"
+    else:
+      result = parsed_output.group(1) + parsed_output.group(2)
+
     compiler_version_cache[cache_key] = result
     return result
   except Exception, e:

Places

File gcc50-fixes.diff of Package chromium (Revision 9d45cbe54ce7ad1824c8ade4358a8ae8)

Places