From aeb79fea328b532aeabb5f22cb89d6bbaf801d86 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 21 Feb 2019 13:44:22 +0100 Subject: Do not pass ar to gn, update Chromium qmake does not have cross specs archiver definition, so do not pass it. Updates Chromium: 29a45e8b7f Fix not working ar on windows c2a58ec0a9 Fix builds with no xrandr 76b0b85ab0 Disable download and print buttons in PDF viewer fa79a21c87 Fix extensions build for Windows on 71-based 6c56c89f1a Bypass CHECK for uninitialized resources when destroying plugin host Change-Id: I45eb7ab7fb3d9e8d9346559fdd7607bbac83675b Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- src/buildtools/gn.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdparty b/src/3rdparty index bb8520a5b..29a45e8b7 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit bb8520a5b4a49085e38b70cb4c95baf75ea374e9 +Subproject commit 29a45e8b7f5ddd792eb1e8a0332f68a68b08c2c6 diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 7766af075..8151ca8ee 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -20,7 +20,7 @@ build_pass|!debug_and_release { gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ - --ld \"$$which($$QMAKE_LINK)\" --ar \"$$which(ar)\" + --ld \"$$which($$QMAKE_LINK)\" message($$gn_configure) !system("$$pythonPathForSystem() $$gn_configure") { error("GN generation error!") -- cgit v1.2.3