Merge "Disable AArch64 XOM when not using lld."

2018-11-29 15:58:39 +00:00
parent d5bb13addb f9f03e0119
commit 6750532978
1 changed files with 3 additions and 1 deletions
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -91,7 +91,9 @@ ifeq ($(strip $(ENABLE_XOM)),true)

    ifeq ($(strip $(my_xom)),true)
      ifeq (arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
-        my_ldflags += -Wl,-execute-only
+        ifeq ($(my_use_clang_lld),true)
+          my_ldflags += -Wl,-execute-only
+        endif
      endif
    endif
  endif