www-client/chromium: use cxx for linking when bootstrapping gn

Bug: https://bugs.gentoo.org/597218

Package-Manager: portage-2.3.2

diff --git a/www-client/chromium/chromium-54.0.2840.59.ebuild b/www-client/chromium/chromium-54.0.2840.59.ebuild
index 150f342b539acfd8701e4c1edb98c93e57d2bb17..80087d2944563a6d5ca9dd62e49da6898dd0afb6 100644 (file)
--- a/www-client/chromium/chromium-54.0.2840.59.ebuild
+++ b/www-client/chromium/chromium-54.0.2840.59.ebuild
@@ -165,6 +165,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-system-jinja-r13.patch"
        "${FILESDIR}/${PN}-widevine-r1.patch"
        "${FILESDIR}/chromium-54-ffmpeg2compat.patch"
+       "${FILESDIR}/${PN}-gn-bootstrap-ld.patch"
 )
 
 pkg_pretend() {
@@ -537,10 +538,6 @@ src_configure() {
        # Make sure the build system will use the right tools, bug #340795.
        tc-export AR CC CXX NM
 
-       # Work around people setting LD in make.conf, bug 597218.
-       # gn's bootstrap.py looks at the environment first.
-       export LD=${CXX}
-
        # Define a custom toolchain for GN
        myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
 

diff --git a/www-client/chromium/chromium-55.0.2873.0.ebuild b/www-client/chromium/chromium-55.0.2873.0.ebuild
index 133ec4a2caa83912d2a62f5f9092252c12764156..cc219080cb55398f544a05428de34c03a418f54b 100644 (file)
--- a/www-client/chromium/chromium-55.0.2873.0.ebuild
+++ b/www-client/chromium/chromium-55.0.2873.0.ebuild
@@ -168,6 +168,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-54-ffmpeg2compat.patch"
        "${FILESDIR}/${PN}-gn-r7.patch"
        "${FILESDIR}/${PN}-system-zlib-r1.patch"
+       "${FILESDIR}/${PN}-gn-bootstrap-ld.patch"
 )
 
 pkg_pretend() {
@@ -535,10 +536,6 @@ src_configure() {
        # Make sure the build system will use the right tools, bug #340795.
        tc-export AR CC CXX NM
 
-       # Work around people setting LD in make.conf, bug 597218.
-       # gn's bootstrap.py looks at the environment first.
-       export LD=${CXX}
-
        # Define a custom toolchain for GN
        myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
 

diff --git a/www-client/chromium/files/chromium-gn-bootstrap-ld.patch b/www-client/chromium/files/chromium-gn-bootstrap-ld.patch
new file mode 100644 (file)
index 0000000..7916a7b
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-bootstrap-ld.patch
@@ -0,0 +1,29 @@
+From 7f8c896c0e4d7e65b94a23e4e75fc6d1545c3cfd Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 17 Oct 2016 10:41:10 -0400
+Subject: [PATCH] gn: bootstrap: always use cxx for linking
+
+LD may be set to something like "ld.bfd" or "ld.gold". We want to let
+the compiler invoke the linker instead of calling these directly.
+
+Bug: https://bugs.gentoo.org/597218
+---
+ tools/gn/bootstrap/bootstrap.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index b86757a..d66da12 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -288,7 +288,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+   else:
+     cc = os.environ.get('CC', 'cc')
+     cxx = os.environ.get('CXX', 'c++')
+-    ld = os.environ.get('LD', cxx)
++    ld = cxx
+     ar = os.environ.get('AR', 'ar')
+ 
+   cflags = os.environ.get('CFLAGS', '').split()
+-- 
+2.10.1
+