summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-12-07 13:46:27 -0800
committerMike Morris <michael.patrick.morris@gmail.com>2015-12-07 15:51:56 -0800
commite0ef94c37a6a289fb8a7c4ff1b4752fc382924db (patch)
treed29d42454e1f1aa0cbb4f4d16f946afd4fe95615
parent959f47280e34fcb136bff8f8795098a03da29c46 (diff)
downloadqtlocation-mapboxgl-e0ef94c37a6a289fb8a7c4ff1b4752fc382924db.tar.gz
[core] reapply 263702b to fix Linux g++-4.9 builds
-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 b7da768fb3..310fad7037 100644
--- a/deps/gyp/pylib/gyp/generator/make.py
+++ b/deps/gyp/pylib/gyp/generator/make.py
@@ -1480,7 +1480,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')