chromium: fix x86_64-musl gn bootstrap

srcpkgs/chromium/template

@@ -43,8 +43,7 @@ post_extract() {
 		done
 		;;
 	esac
-}
+
-pre_configure() {
 	# Use the file at run time instead of effectively compiling it in
 	sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
 		-i device/usb/BUILD.gn
@@ -59,29 +58,6 @@ do_configure() {
 	local system="" bootstrap_conf="" conf=""
 	export -n CFLAGS CXXFLAGS LDFLAGS
 
-	# bootstrap NaCL toolchain
-	if [ -n "$build_option_nacl" ] && [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		# XXX xtraeme: fix gcc{,-c++}-multilib instead.
-		ldconfig &>/dev/null
-		# Download NaCL toolchains
-		python2 nbuild/download_acl_toolchains.py \
-			--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract
-		# donwload clang
-		python2 tools/clang/scripts/update.py
-		ln -s /usr/lib/libncursesw.so.6 third_party/llvm-build/Release+Asserts/lib/libtinfo.so.5
-	fi
-
-	# bootstrap GN
-	bootstrap_conf='
-		use_sysroot=false
-		is_clang=false
-		use_gconf=false
-		treat_warnings_as_errors=false
-		binutils_path="/usr/bin"
-		use_allocator="none"'
-	AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \
-		python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${bootstrap_conf//	/ }"
-
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_libsrtp.
@@ -125,6 +101,32 @@ do_configure() {
 
 	python2 third_party/libaddressinput/chromium/tools/update-strings.py
 
+	# bootstrap NaCL toolchain
+	if [ -n "$build_option_nacl" ] && [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		# XXX xtraeme: fix gcc{,-c++}-multilib instead.
+		ldconfig &>/dev/null
+		# Download NaCL toolchains
+		python2 nbuild/download_acl_toolchains.py \
+			--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract
+		# donwload clang
+		python2 tools/clang/scripts/update.py
+		ln -s /usr/lib/libncursesw.so.6 third_party/llvm-build/Release+Asserts/lib/libtinfo.so.5
+	fi
+
+	# bootstrap GN
+	bootstrap_conf='
+		is_clang=false
+		treat_warnings_as_errors=false
+		binutils_path="/usr/bin"
+		gold_path="/usr/bin/ld.gold"
+		use_gconf=false
+		use_sysroot=false
+		use_gold=true
+		use_allocator="none"
+		use_experimental_allocator_shim=false'
+	AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \
+		python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${bootstrap_conf//	/ }"
+
 	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 	# Note: These are for Void Linux use ONLY.
 	conf+='