Commit c45fc409 authored by Andras Becsi's avatar Andras Becsi Committed by The Qt Project
Browse files

Update eLinux patch to match the snapshot


This also updates the snapshot shasum.

Change-Id: I4c76585d3285d33d5af5369dbb56b52f2434ef82
Reviewed-by: default avatarZeno Albisser <zeno.albisser@digia.com>
Showing with 1 addition and 10 deletions
......@@ -75,15 +75,6 @@ diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 1451afb..2a2c8bd 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -5,7 +5,7 @@
{
'variables': {
'conditions': [
- ['sysroot!=""', {
+ ['sysroot!="" and qt_os!="embedded_linux"', {
'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
}, {
'pkg-config': 'pkg-config'
@@ -506,6 +506,8 @@
{
'target_name': 'libpci',
......
3rdparty @ a462a800
Subproject commit 2d4f839849d8de907d3addd09a0682a53bf47c6a
Subproject commit a462a800bdf84baf6eca4fcc583684582d5419ce
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment