From ce2f1b140d2d417f925ec54c8a095981827f7e68 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 6 Sep 2016 15:27:50 +0200 Subject: Do not assume neon on armv7 Chromium defaults to arm_neon=1 and then sets -mfpu=neon if the arm architecture is 7. Change-Id: Ib144dd4188ba4221ed35367026de9f9a04c69792 Reviewed-by: Michal Klocek --- src/core/gyp_run.pro | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/gyp_run.pro') diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 885df908c..ee62e5d72 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -79,6 +79,10 @@ contains(QT_ARCH, "arm") { contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1 else:!lessThan(MARMV, 7): GYP_CONFIG += arm_neon=0 arm_neon_optional=1 else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0 + } else { + # Chromium defaults to arm_neon=1, Qt does not. + GYP_CONFIG += arm_neon=0 + !lessThan(MARMV, 7): GYP_CONFIG += arm_neon_optional=1 } contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 -- cgit v1.2.3 From 9766adb01943873d9109968911734be8e5dcb150 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 8 Sep 2016 11:48:22 +0200 Subject: Fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now get a multiword value from $$pkgConfigExecutable which will cause us to treat it as multiple gyp config sets, which will make gyp fail. Change-Id: Icdf781bb633d804ff6355e882dc4997bb5f3310f Reviewed-by: Michael Brüning --- src/core/gyp_run.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/gyp_run.pro') diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 71c1e063c..9b45af3be 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -19,7 +19,7 @@ cross_compile { GYP_CONFIG += qtwe_process_name_debug=$$QTWEBENGINEPROCESS_NAME_DEBUG GYP_CONFIG += qtwe_process_name_release=$$QTWEBENGINEPROCESS_NAME_RELEASE GYP_CONFIG += disable_glibcxx_debug=1 -!contains(QT_CONFIG, no-pkg-config): GYP_CONFIG += pkg-config=$$pkgConfigExecutable() +!contains(QT_CONFIG, no-pkg-config): GYP_ARGS += "-D pkg-config=\"$$pkgConfigExecutable()\"" !webcore_debug: GYP_CONFIG += remove_webcore_debug_symbols=1 !v8base_debug: GYP_CONFIG += remove_v8base_debug_symbols=1 -- cgit v1.2.3