Index: pylib/gyp/generator/make.py |
=================================================================== |
--- pylib/gyp/generator/make.py (revision 601) |
+++ pylib/gyp/generator/make.py (working copy) |
@@ -32,7 +32,7 @@ |
generator_default_variables = { |
'EXECUTABLE_PREFIX': '', |
'EXECUTABLE_SUFFIX': '', |
- 'OS': 'linux', |
+# 'OS': 'linux', |
'INTERMEDIATE_DIR': '$(obj)/geni', |
'SHARED_INTERMEDIATE_DIR': '$(obj)/gen', |
'PRODUCT_DIR': '$(builddir)', |
@@ -614,8 +614,8 @@ |
config = configs[configname] |
self.WriteList(config.get('ldflags'), 'LDFLAGS_%s' % configname) |
self.WriteList(spec.get('libraries'), 'LIBS') |
- self.WriteLn('%s: LDFLAGS := $(LDFLAGS_$(BUILDTYPE)) ' |
- '$(LIBS)' % self.output) |
+ self.WriteLn('%s: LDFLAGS := $(LDFLAGS_$(BUILDTYPE))' % self.output) |
+ self.WriteLn('%s: LIBS := $(LIBS)' % self.output) |
if self.type == 'executable': |
self.WriteDoCmd([self.output], link_deps, 'link') |