Skip to content

Commit d7e8d28

Browse files
committed
Merge pull request SynoCommunity#24 from GuillaumeSmaha/cytec-ffmpeg-update-clean-x265-yasm
Clean x265
2 parents 23c1aa2 + 667e1cf commit d7e8d28

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

cross/x265/Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CONFIGURE_TARGET = myConfigure
1515

1616
include ../../mk/spksrc.cross-cc.mk
1717

18+
YASM_PATH = $(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin
1819

1920
CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(STAGING_INSTALL_PREFIX)
2021
CMAKE_ARGS += -DEXTRA_LINK_FLAGS="-ldl"
@@ -39,15 +40,13 @@ endif
3940

4041
ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
4142
DEPENDS += native/yasm cross/libnuma
42-
ENV += AS=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/yasm
43-
ENV += PATH=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/:$$PATH
43+
ENV += PATH=$(YASM_PATH):$$PATH
4444
CMAKE_ARGS += -DCMAKE_SYSTEM_PROCESSOR=x86_64
4545
endif
4646

4747
ifeq ($(findstring $(ARCH), $(x86_ARCHES)),$(ARCH))
4848
DEPENDS += native/yasm cross/libnuma
49-
ENV += AS=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/yasm
50-
ENV += PATH=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/:$$PATH
49+
ENV += PATH=$(YASM_PATH):$$PATH
5150
CMAKE_ARGS += -DCMAKE_SYSTEM_PROCESSOR=x86
5251
endif
5352

0 commit comments

Comments
 (0)