Changeset 118678 in webkit

Timestamp:

May 28, 2012, 6:16:05 AM (14 years ago)

Author:

peter@chromium.org

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.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• gyp_webkit (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-28  Peter Beverloo  <peter@chromium.org>
+
+        [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  <keishi@webkit.org>
 

trunk/Source/WebKit/chromium/gyp_webkit

@@ -88 +88 @@
       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')