diff --git a/pylib/gyp/__init__.py b/pylib/gyp/__init__.py index c9c94869..976d5b6a 100755 --- a/pylib/gyp/__init__.py +++ b/pylib/gyp/__init__.py @@ -104,12 +104,16 @@ def Load( default_variables.setdefault(key, val) output_dir = params["options"].generator_output or params["options"].toplevel_dir - if (default_variables['GENERATOR'] == 'ninja'): - default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir, - 'out', default_variables['build_type'])) + if default_variables["GENERATOR"] == "ninja": + default_variables.setdefault( + "PRODUCT_DIR_ABS", + os.path.join(output_dir, "out", default_variables["build_type"]), + ) else: - default_variables.setdefault("PRODUCT_DIR_ABS", os.path.join(output_dir, - default_variables['CONFIGURATION_NAME'])) + default_variables.setdefault( + "PRODUCT_DIR_ABS", + os.path.join(output_dir, default_variables["CONFIGURATION_NAME"]), + ) # Give the generator the opportunity to set additional variables based on # the params it will receive in the output phase. diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py index b59ce60d..e225326e 100644 --- a/pylib/gyp/generator/make.py +++ b/pylib/gyp/generator/make.py @@ -158,12 +158,12 @@ def CalculateGeneratorInputInfo(params): # Note: this does not handle spaces in paths define xargs - $(1) $(word 1,$(2)) + $(1) $(word 1,$(2)) $(if $(word 2,$(2)),$(call xargs,$(1),$(wordlist 2,$(words $(2)),$(2)))) endef define write-to-file - @: >$(1) + @: >$(1) $(call xargs,@printf "%s\\n" >>$(1),$(2)) endef @@ -227,12 +227,12 @@ def CalculateGeneratorInputInfo(params): # Note: this does not handle spaces in paths define xargs - $(1) $(word 1,$(2)) + $(1) $(word 1,$(2)) $(if $(word 2,$(2)),$(call xargs,$(1),$(wordlist 2,$(words $(2)),$(2)))) endef define write-to-file - @: >$(1) + @: >$(1) $(call xargs,@printf "%s\\n" >>$(1),$(2)) endef