diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-12-16 10:40:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 10:49:02 +0100 |
| commit | df8eff9b1e457fe0783cc6022bf7c21f5381afbb (patch) | |
| tree | 62d282de99c1409d13612cf6ab85972188cb3409 /patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch | |
| parent | 0dd71c40535335affe93bbde0543b81be796f03e (diff) | |
Revert "Update chromium patches to apply on current stable (1650)"
Let's make sure that the submodule integration succeeds first.
This reverts commit 6aa4bb60d7d10e50cb562756ef8210f559b35d1e.
Change-Id: I5c9b81654296b3a8a240118f9af222b12dd2ecc4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch')
| -rw-r--r-- | patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch b/patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch index 68eb74500..0baed04a2 100644 --- a/patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch +++ b/patches/0001-Add-support-for-libc-to-xcode_emulation.py.patch @@ -1,4 +1,4 @@ -From 43673a67cdcced912cad207ee0fbca7321f72ecf Mon Sep 17 00:00:00 2001 +From ade7ffb418d848084cd35efdadfdc6524700115c Mon Sep 17 00:00:00 2001 From: Zeno Albisser <zeno.albisser@digia.com> Date: Thu, 27 Jun 2013 20:04:51 +0200 Subject: [PATCH] Add support for libc++ to xcode_emulation.py @@ -8,10 +8,10 @@ Subject: [PATCH] Add support for libc++ to xcode_emulation.py 1 file changed, 3 insertions(+) diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py -index b4af0fd..fb40048 100644 +index c6f018c..f118b94 100644 --- a/pylib/gyp/xcode_emulation.py +++ b/pylib/gyp/xcode_emulation.py -@@ -580,6 +580,9 @@ class XcodeSettings(object): +@@ -541,6 +541,9 @@ class XcodeSettings(object): for ldflag in self._Settings().get('OTHER_LDFLAGS', []): ldflags.append(self._MapLinkerFlagFilename(ldflag, gyp_to_build_path)) @@ -22,5 +22,5 @@ index b4af0fd..fb40048 100644 ldflags.append('-Wl,-dead_strip') -- -1.8.4.2 +1.8.0.1 |