[vlc-commits] contrib: x265: Don't guess the target cpu architecture from the host build system

Martin Storsjö git at videolan.org
Fri Jan 5 15:49:29 CET 2018


vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 28 22:58:32 2017 +0200| [a653b399e98f5e7a14f5d59c14447dd6477598ce] | committer: Jean-Baptiste Kempf

contrib: x265: Don't guess the target cpu architecture from the host build system

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 3709f5ff86191f2c0146c4cbb34ebd3a180cfecb)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a653b399e98f5e7a14f5d59c14447dd6477598ce
---

 contrib/src/x265/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 520edb65b1..95b797333a 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -35,7 +35,7 @@ endif
 
 .x265: x265 toolchain.cmake
 	$(REQUIRE_GPL)
-	cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF
+	cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH)
 	cd $</source && $(MAKE) install
 	sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"
 	touch $@



More information about the vlc-commits mailing list