Date: Sun, 22 Oct 2017 21:34:37 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324873 - in projects/runtime-coverage: lib/libclang_rt share/mk Message-ID: <201710222134.v9MLYbfE072147@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Oct 22 21:34:37 2017 New Revision: 324873 URL: https://svnweb.freebsd.org/changeset/base/324873 Log: Define TARGET_CPUARCH and use in libclang_rt as the basis for CRTARCH When cross-compiling, the wrong architecture was being embedded in the libclang_rt binary filenames. It should be based on TARGET_ARCH (target), not MACHINE_ARCH (host). This is a draft commit against my project branch. Will fix on ^/head soon. PR: 222925 Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc projects/runtime-coverage/share/mk/sys.mk Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc ============================================================================== --- projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Oct 22 21:11:59 2017 (r324872) +++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Oct 22 21:34:37 2017 (r324873) @@ -2,7 +2,7 @@ .include <src.opts.mk> -CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/} +CRTARCH= ${TARGET_CPUARCH:C/amd64/x86_64/} CRTSRC= ${SRCTOP}/contrib/compiler-rt .PATH: ${CRTSRC}/lib Modified: projects/runtime-coverage/share/mk/sys.mk ============================================================================== --- projects/runtime-coverage/share/mk/sys.mk Sun Oct 22 21:11:59 2017 (r324872) +++ projects/runtime-coverage/share/mk/sys.mk Sun Oct 22 21:34:37 2017 (r324873) @@ -15,6 +15,7 @@ unix ?= We run FreeBSD, not UNIX. # __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[67])?(eb)?/arm/:C/powerpc(64|spe)/powerpc/:C/riscv64(sf)?/riscv/ MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} +TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710222134.v9MLYbfE072147>