Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2933)

Unified Diff: build/gyp_chromium

Issue 100053008: Check getconf to get the bittedness of the local system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 8a16a85b1c02453dbe6be0ca960ced84ccc29390..8409a28de114918e09ce23a46caaebe2a10c7e33 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -131,9 +131,8 @@ def RunGN(supplemental_includes):
if sys.platform == 'win32':
gnpath += 'win/gn.exe'
elif sys.platform.startswith('linux'):
- # On Linux we have 32-bit and 64-bit versions. Checking /sbin/init avoids
- # uname's confusion when running a 32-bit userland on a 64-bit kernel.
- if subprocess.check_output(["file", "/sbin/init"]).find("ELF 64-bit") >= 0:
+ # On Linux we have 32-bit and 64-bit versions.
+ if subprocess.check_output(["getconf", "LONG_BIT"]).find("64") >= 0:
gnpath += 'linux/gn'
else:
gnpath += 'linux/gn32'
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698