diff options
Diffstat (limited to 'third_party/yasm/genmacro.host.linux-x86.mk')
| -rw-r--r-- | third_party/yasm/genmacro.host.linux-x86.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/third_party/yasm/genmacro.host.linux-x86.mk b/third_party/yasm/genmacro.host.linux-x86.mk index c67557db33..c25706a31f 100644 --- a/third_party/yasm/genmacro.host.linux-x86.mk +++ b/third_party/yasm/genmacro.host.linux-x86.mk @@ -3,17 +3,18 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE := third_party_yasm_genmacro_host_gyp +LOCAL_MODULE := third_party_yasm_genmacro_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp LOCAL_MODULE_STEM := genmacro LOCAL_MODULE_SUFFIX := LOCAL_MODULE_TAGS := optional LOCAL_IS_HOST_MODULE := true -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_yasm_config_sources_host_gyp,true)/config_sources.stamp + $(call intermediates-dir-for,GYP,third_party_yasm_config_sources_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp,true)/config_sources.stamp GYP_GENERATED_OUTPUTS := @@ -179,11 +180,11 @@ LOCAL_SHARED_LIBRARIES := # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: third_party_yasm_genmacro_host_gyp +gyp_all_modules: third_party_yasm_genmacro_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp # Alias gyp target name. .PHONY: genmacro -genmacro: third_party_yasm_genmacro_host_gyp +genmacro: third_party_yasm_genmacro_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp LOCAL_MODULE_PATH := $(gyp_shared_intermediate_dir) include $(BUILD_HOST_EXECUTABLE) |