diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-12 10:29:30 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-04-13 10:53:21 +0000 |
| commit | 1b52360ec26fa666d70430a1c81804933480b0d2 (patch) | |
| tree | db650f85aee79133bb5cd84104dde73e976ebe95 /src/core/gyp_run.pro | |
| parent | d27fc2d9884e83fbfa9bc31a5c560d2b4d9197b5 (diff) | |
Fix merge duplication
We already set sysroot to empty for all none cross_compile builds in
the 5.7 branch.
Change-Id: I99626694983c776f46d0e5daa9b1e39614266cb6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 51fe9ad1d..50b6c5112 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -84,7 +84,6 @@ contains(QT_ARCH, "arm") { } contains(QT_ARCH, "mips") { - !cross_compile: GYP_CONFIG += sysroot=\"\" GYP_CONFIG += target_arch=mipsel contains(QMAKE_CFLAGS, "mips32r6"): mips_arch_variant=\"r6\" |