summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-04-22 10:18:32 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-04-22 10:18:32 +0200
commit263702b499ecc0862a81467b9130a259c67d767e (patch)
tree439c0dde6ff84a190f541f46b420265d8322d976 /deps
parent29fdfacfded3af0f31a90e5e78f6c827a7a0cb9d (diff)
downloadqtlocation-mapboxgl-263702b499ecc0862a81467b9130a259c67d767e.tar.gz
remove library name deduplication from gyp
refs #155
Diffstat (limited to 'deps')
-rw-r--r--deps/gyp/pylib/gyp/generator/make.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/gyp/pylib/gyp/generator/make.py b/deps/gyp/pylib/gyp/generator/make.py
index b88a433d3d..b6f766d554 100644
--- a/deps/gyp/pylib/gyp/generator/make.py
+++ b/deps/gyp/pylib/gyp/generator/make.py
@@ -1447,7 +1447,8 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
libraries = spec.get('libraries')
if libraries:
# Remove duplicate entries
- libraries = gyp.common.uniquer(libraries)
+ # Commented out due to https://code.google.com/p/gyp/issues/detail?id=419
+ # libraries = gyp.common.uniquer(libraries)
if self.flavor == 'mac':
libraries = self.xcode_settings.AdjustLibraries(libraries)
self.WriteList(libraries, 'LIBS')