Commit b77cc09b authored by Anton Mitrofanov's avatar Anton Mitrofanov
Browse files

Fix ARCH variable name conflict with BSD ports (bsd.port.mk) read-only variable

parent 6e769846
...@@ -87,12 +87,12 @@ X86SRC0 += sad-a.asm ...@@ -87,12 +87,12 @@ X86SRC0 += sad-a.asm
endif endif
X86SRC = $(X86SRC0:%=common/x86/%) X86SRC = $(X86SRC0:%=common/x86/%)
ifeq ($(ARCH),X86) ifeq ($(SYS_ARCH),X86)
ARCH_X86 = yes ARCH_X86 = yes
ASMSRC = $(X86SRC) common/x86/pixel-32.asm ASMSRC = $(X86SRC) common/x86/pixel-32.asm
endif endif
ifeq ($(ARCH),X86_64) ifeq ($(SYS_ARCH),X86_64)
ARCH_X86 = yes ARCH_X86 = yes
ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
endif endif
...@@ -106,7 +106,7 @@ endif ...@@ -106,7 +106,7 @@ endif
endif endif
# AltiVec optims # AltiVec optims
ifeq ($(ARCH),PPC) ifeq ($(SYS_ARCH),PPC)
ifneq ($(AS),) ifneq ($(AS),)
SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
common/ppc/quant.c common/ppc/deblock.c \ common/ppc/quant.c common/ppc/deblock.c \
...@@ -115,7 +115,7 @@ endif ...@@ -115,7 +115,7 @@ endif
endif endif
# NEON optims # NEON optims
ifeq ($(ARCH),ARM) ifeq ($(SYS_ARCH),ARM)
ifneq ($(AS),) ifneq ($(AS),)
ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \ ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
...@@ -126,7 +126,7 @@ endif ...@@ -126,7 +126,7 @@ endif
endif endif
# AArch64 NEON optims # AArch64 NEON optims
ifeq ($(ARCH),AARCH64) ifeq ($(SYS_ARCH),AARCH64)
ifneq ($(AS),) ifneq ($(AS),)
ASMSRC += common/aarch64/bitstream-a.S \ ASMSRC += common/aarch64/bitstream-a.S \
common/aarch64/cabac-a.S \ common/aarch64/cabac-a.S \
......
...@@ -1211,7 +1211,7 @@ exec_prefix=$exec_prefix ...@@ -1211,7 +1211,7 @@ exec_prefix=$exec_prefix
bindir=$bindir bindir=$bindir
libdir=$libdir libdir=$libdir
includedir=$includedir includedir=$includedir
ARCH=$ARCH SYS_ARCH=$ARCH
SYS=$SYS SYS=$SYS
CC=$CC CC=$CC
CFLAGS=$CFLAGS CFLAGS=$CFLAGS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment