[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android 8f3f9c25505: Fix calls to nasm in cross/ndk-build
From: |
Po Lu |
Subject: |
feature/android 8f3f9c25505: Fix calls to nasm in cross/ndk-build |
Date: |
Sat, 4 Mar 2023 08:01:49 -0500 (EST) |
branch: feature/android
commit 8f3f9c25505e1fd76b44153d25fae0c854203c5c
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Fix calls to nasm in cross/ndk-build
* cross/ndk-build/ndk-build-shared-library.mk:
* cross/ndk-build/ndk-build-static-library.mk: Ensure nasm
generates ELF objects.
---
cross/ndk-build/ndk-build-shared-library.mk | 2 +-
cross/ndk-build/ndk-build-static-library.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cross/ndk-build/ndk-build-shared-library.mk
b/cross/ndk-build/ndk-build-shared-library.mk
index 3a400644070..0af68980cfc 100644
--- a/cross/ndk-build/ndk-build-shared-library.mk
+++ b/cross/ndk-build/ndk-build-shared-library.mk
@@ -77,7 +77,7 @@ $$(error Trying to build nasm file on non-Intel platform!)
else
$(call objname,$(LOCAL_MODULE),$(basename $(1))): $(LOCAL_PATH)/$(1)
- $(NDK_BUILD_NASM) -o $$@ -i $(LOCAL_PATH) -i $$(dir $$<)
$(NDK_ASFLAGS_$(LOCAL_MODULE)) $$<
+ $(NDK_BUILD_NASM) -felf -o $$@ -i $(LOCAL_PATH) -i $$(dir $$<)
$(NDK_ASFLAGS_$(LOCAL_MODULE)) $$<
endif
endif
diff --git a/cross/ndk-build/ndk-build-static-library.mk
b/cross/ndk-build/ndk-build-static-library.mk
index 3566ee2c65e..88be518cd39 100644
--- a/cross/ndk-build/ndk-build-static-library.mk
+++ b/cross/ndk-build/ndk-build-static-library.mk
@@ -65,7 +65,7 @@ $$(error Trying to build nasm file on non-Intel platform!)
else
$(call objname,$(LOCAL_MODULE),$(basename $(1))): $(call
maybe-absolute,$(1),$(2))
- $(NDK_BUILD_NASM) -o $$@ -i $(LOCAL_PATH) -i $$(dir $$<)
$(NDK_ASFLAGS_$(LOCAL_MODULE)) $$<
+ $(NDK_BUILD_NASM) -felf -o $$@ -i $(LOCAL_PATH) -i $$(dir $$<)
$(NDK_ASFLAGS_$(LOCAL_MODULE)) $$<
endif
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/android 8f3f9c25505: Fix calls to nasm in cross/ndk-build,
Po Lu <=