diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-31 16:27:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-03 17:50:35 +0100 |
| commit | ecaab295f96e3d12fc952c49d35a6eb32f72aba1 (patch) | |
| tree | 0274229243a57462c2a24f4162b597235ce9b755 /patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch | |
| parent | a4b0e2183c23c0173167833c75f0e2970f3ab524 (diff) | |
Make it easier to update patches and apply them manually
Clean the way that we maintain patches by keeping them ordered by
their number and let the shell order them when giving the list to
git am.
Provide a update-patches.sh that maintains the proper command lines
to use and run a cleaning script on the resulting patch to avoid
the SHA1 to be added to the file as it changes every time the patch
is applied.
Change-Id: Ia93cf4b35f5f847a8723a31fc476443864242737
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch')
| -rw-r--r-- | patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch b/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch new file mode 100644 index 000000000..d12bad22b --- /dev/null +++ b/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Zeno Albisser <zeno.albisser@digia.com> +Date: Thu, 27 Jun 2013 20:04:51 +0200 +Subject: Add support for libc++ to xcode_emulation.py + +--- + pylib/gyp/xcode_emulation.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py +index b4af0fd..fb40048 100644 +--- a/pylib/gyp/xcode_emulation.py ++++ b/pylib/gyp/xcode_emulation.py +@@ -580,6 +580,9 @@ class XcodeSettings(object): + for ldflag in self._Settings().get('OTHER_LDFLAGS', []): + ldflags.append(self._MapLinkerFlagFilename(ldflag, gyp_to_build_path)) + ++ if self._Test('USE_LIBCPP', 'YES', default='NO'): ++ ldflags.append('-stdlib=libc++') ++ + if self._Test('DEAD_CODE_STRIPPING', 'YES', default='NO'): + ldflags.append('-Wl,-dead_strip') + |