| Index: make/platform/clang_nacl.mk
|
| diff --git a/make/platform/clang_nacl.mk b/make/platform/clang_nacl.mk
|
| index b6a85052dc05e92d1040b7cb3ee58ff6f6a4850c..ec04bc9838441ff69fb27021086d7e2070f89cb1 100644
|
| --- a/make/platform/clang_nacl.mk
|
| +++ b/make/platform/clang_nacl.mk
|
| @@ -20,8 +20,6 @@ endif
|
|
|
| CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple)))
|
| $(call CheckValue,CompilerTargetTriple)
|
| -# Only define configs if we detected a nacl target.
|
| -ifneq ($(findstring -nacl,$(CompilerTargetTriple)),)
|
|
|
| ifneq ($(findstring pnacl-clang,$(CC)),)
|
| # pnacl-clang already uses the integrated assembler and does not support the
|
| @@ -40,13 +38,7 @@ ifeq ($(call contains,x86_64,$(CompilerTargetArch)),true)
|
| Configs += full-x86_64
|
| Arch.full-x86_64 := x86_64
|
| else
|
| -ifeq ($(call contains,arm,$(CompilerTargetArch)),true)
|
| -# arm-nacl-clang reports this target
|
| -Configs += full-arm
|
| -Arch.full-arm := armv7
|
| -else
|
| -ifeq ($(call contains,armv7,$(CompilerTargetArch)),true)
|
| -# pnacl-clang with arm bias (used for arm-nonsfi) reports this target
|
| +ifeq ($(call contains,arm armv7 armv7a,$(CompilerTargetArch)),true)
|
| Configs += full-arm
|
| Arch.full-arm := armv7
|
| else
|
| @@ -65,7 +57,6 @@ endif
|
| endif
|
| endif
|
| endif
|
| -endif
|
|
|
| endif
|
|
|
|
|