diff options
| author | Martin Storsjo <martin@martin.st> | 2015-06-18 10:39:06 +0300 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-06-25 08:25:51 -0700 |
| commit | 9831e85efde08790a58920ab6d24bd9df48a025b (patch) | |
| tree | 8c9414340e3b6cb3d1b792887be6e4a2d88f8bd3 | |
| parent | 56378a82a6ea1928352428b290e801a9dcd6fd34 (diff) | |
| download | android_external_libavc-9831e85efde08790a58920ab6d24bd9df48a025b.tar.gz android_external_libavc-9831e85efde08790a58920ab6d24bd9df48a025b.tar.bz2 android_external_libavc-9831e85efde08790a58920ab6d24bd9df48a025b.zip | |
Don't add -m32/-m64 to the cflags
If the environment already indicates that the compiler targets
either x86 or x86_64, we don't need to enforce this by trying to
force the compiler to output a specific bitness.
Change-Id: Ife6e717e90b4da4edd852dcd66ad92dba70939a2
| -rw-r--r-- | decoder.x86.mk | 2 | ||||
| -rw-r--r-- | decoder.x86_64.mk | 2 | ||||
| -rw-r--r-- | encoder.x86.mk | 2 | ||||
| -rw-r--r-- | encoder.x86_64.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/decoder.x86.mk b/decoder.x86.mk index 2915ffd..e7a4686 100644 --- a/decoder.x86.mk +++ b/decoder.x86.mk @@ -1,4 +1,4 @@ -libavcd_cflags_x86 += -DX86 -m32 -msse4.2 -mno-avx -DDEFAULT_ARCH=D_ARCH_X86_SSE42 +libavcd_cflags_x86 += -DX86 -msse4.2 -mno-avx -DDEFAULT_ARCH=D_ARCH_X86_SSE42 libavcd_inc_dir_x86 += $(LOCAL_PATH)/decoder/x86 libavcd_inc_dir_x86 += $(LOCAL_PATH)/common/x86 diff --git a/decoder.x86_64.mk b/decoder.x86_64.mk index 78425b7..b265f4f 100644 --- a/decoder.x86_64.mk +++ b/decoder.x86_64.mk @@ -1,4 +1,4 @@ -libavcd_cflags_x86_64 += -DX86 -m64 -msse4.2 -mno-avx -DDEFAULT_ARCH=D_ARCH_X86_SSE42 +libavcd_cflags_x86_64 += -DX86 -msse4.2 -mno-avx -DDEFAULT_ARCH=D_ARCH_X86_SSE42 libavcd_inc_dir_x86_64 += $(LOCAL_PATH)/decoder/x86 libavcd_inc_dir_x86_64 += $(LOCAL_PATH)/common/x86 diff --git a/encoder.x86.mk b/encoder.x86.mk index 8c60380..f1e2ffa 100644 --- a/encoder.x86.mk +++ b/encoder.x86.mk @@ -1,4 +1,4 @@ -libavce_cflags_x86 += -DX86 -m32 -msse4.2 -mno-avx +libavce_cflags_x86 += -DX86 -msse4.2 -mno-avx libavce_inc_dir_x86 += $(LOCAL_PATH)/encoder/x86 libavce_inc_dir_x86 += $(LOCAL_PATH)/common/x86 diff --git a/encoder.x86_64.mk b/encoder.x86_64.mk index 188a1b9..14205a3 100644 --- a/encoder.x86_64.mk +++ b/encoder.x86_64.mk @@ -1,4 +1,4 @@ -libavce_cflags_x86_64 += -DX86 -m64 -msse4.2 -mno-avx +libavce_cflags_x86_64 += -DX86 -msse4.2 -mno-avx libavce_inc_dir_x86_64 += $(LOCAL_PATH)/encoder/x86 libavce_inc_dir_x86_64 += $(LOCAL_PATH)/common/x86 |