diff --git a/deps/gyp/pylib/gyp/generator/make.py b/deps/gyp/pylib/gyp/generator/make.py
index b88a433d3..b6f766d55 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')
diff --git a/linux/llmr-app.gyp b/linux/llmr-app.gyp
index 2a03d9018..e12737b92 100644
--- a/linux/llmr-app.gyp
+++ b/linux/llmr-app.gyp
@@ -42,7 +42,7 @@
             '<@(curl_cflags)',
           ],
           'link_settings': {
-            'ldflags': [
+            'libraries': [
               '<@(glfw3_libraries)',
               '<@(curl_libraries)',
             ],
diff --git a/llmr.gyp b/llmr.gyp
index ff97bb230..aae6630e1 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -97,7 +97,7 @@
                 ]
               }
             }, {
-              'ldflags': [
+              'libraries': [
                 '<@(png_libraries)',
                 '<@(uv_libraries)',
               ]
@@ -167,7 +167,7 @@
                 ]
               }
             }, {
-              'ldflags': [
+              'libraries': [
                 '<@(png_libraries)',
                 '<@(uv_libraries)',
               ]