Title: [118678] trunk/Source/WebKit/chromium
- Revision
- 118678
- Author
- [email protected]
- Date
- 2012-05-28 06:16:05 -0700 (Mon, 28 May 2012)
Log Message
[Chromium] Build fix for the Android bot, set CXX_target at gyp generation-time
https://bugs.webkit.org/show_bug.cgi?id=87649
Unreviewed build fix.
Chromium Android builds were broken because v8 tried to compile files
for target with the "-m32" flag. This was caused by a v8 check falling
back to using "which g++" to find the right compiler, whereas it should
have used the $CXX_target environment variable. This isn't being set
for Android builds.
* gyp_webkit: Set the CXX_target environment variable. Annotate the fix
with a FIXME comment too.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (118677 => 118678)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-28 12:50:01 UTC (rev 118677)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-28 13:16:05 UTC (rev 118678)
@@ -1,3 +1,19 @@
+2012-05-28 Peter Beverloo <[email protected]>
+
+ [Chromium] Build fix for the Android bot, set CXX_target at gyp generation-time
+ https://bugs.webkit.org/show_bug.cgi?id=87649
+
+ Unreviewed build fix.
+
+ Chromium Android builds were broken because v8 tried to compile files
+ for target with the "-m32" flag. This was caused by a v8 check falling
+ back to using "which g++" to find the right compiler, whereas it should
+ have used the $CXX_target environment variable. This isn't being set
+ for Android builds.
+
+ * gyp_webkit: Set the CXX_target environment variable. Annotate the fix
+ with a FIXME comment too.
+
2012-05-28 Keishi Hattori <[email protected]>
Expose value localization function of HTMLInputElement
Modified: trunk/Source/WebKit/chromium/gyp_webkit (118677 => 118678)
--- trunk/Source/WebKit/chromium/gyp_webkit 2012-05-28 12:50:01 UTC (rev 118677)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2012-05-28 13:16:05 UTC (rev 118678)
@@ -87,6 +87,9 @@
envsetup_location = os.path.join(chrome_src, 'build', 'android', 'envsetup.sh')
exit(subprocess.call(['bash', '-c', 'source %s && python gyp_webkit --no-envsetup-recursion %s' % (envsetup_location, ' '.join(args))]))
else:
+ # FIXME: v8 requires the CXX_target variable to determine whether -m32 should be
+ # set. The current Android build set-up is not sustainable and breaks too often.
+ os.environ['CXX_target'] = glob.glob('%s/*-g++' % os.environ.get('ANDROID_TOOLCHAIN'))[0]
args.remove('--no-envsetup-recursion')
# Add includes.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
