From e0ef94c37a6a289fb8a7c4ff1b4752fc382924db Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Mon, 7 Dec 2015 13:46:27 -0800 Subject: [core] reapply 263702b to fix Linux g++-4.9 builds --- deps/gyp/pylib/gyp/generator/make.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'deps') 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') -- cgit v1.2.1