Fix some Android build issues occuring on certain OSX configurations

livecodefraser · livecodefraser · commit 0b56f3472e9d · 2015-07-01T10:20:06.000+01:00
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -239,7 +239,8 @@
 						'product_name': 'Standalone-Community',
 						'product_prefix': '',
 						'product_extension': '',
-						'type': 'loadable_module',
+						'product_dir': '<(PRODUCT_DIR)',	# Shared libraries are not placed in PRODUCT_DIR by default
+						'type': 'shared_library',
 						
 						'ldflags':
 						[
diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py
@@ -138,12 +138,14 @@ def CalculateGeneratorInputInfo(params):
 quiet_cmd_alink_thin = AR($(TOOLSET)) $@
 cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
 
+# Commas need to be escaped in some circumstances
+COMMA := ,
+
 # Figure out the correct --start-group and --end-group commands (not needed for
 # the MacOS linker)
-ifeq ($(shell uname),Linux)
-  opt_start_group := -Wl,--start-group
-  opt_end_group   := -Wl,--end-group
-endif
+opt_start_group = $(if $(or $(filter $(shell uname),Linux),$(filter $(TOOLSET),target)),-Wl$(COMMA)--start-group)
+opt_end_group   = $(if $(or $(filter $(shell uname),Linux),$(filter $(TOOLSET),target)),-Wl$(COMMA)--end-group)
+
 
 # Due to circular dependencies between libraries :(, we wrap the
 # special "figure out circular dependencies" flags around the entire

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,8 @@`
`239`	`239`	`'product_name': 'Standalone-Community',`
`240`	`240`	`'product_prefix': '',`
`241`	`241`	`'product_extension': '',`
`242`		`- 'type': 'loadable_module',`
	`242`	`+ 'product_dir': '<(PRODUCT_DIR)', # Shared libraries are not placed in PRODUCT_DIR by default`
	`243`	`+ 'type': 'shared_library',`
`243`	`244`
`244`	`245`	`'ldflags':`
`245`	`246`	`[`