Differential D22425 Diff 64479 lib/libclang_rt/Makefile.inc

Changeset View

Standalone View

lib/libclang_rt/Makefile.inc

	# $FreeBSD$			# $FreeBSD$

	.include <bsd.compiler.mk>			.include <bsd.compiler.mk>

	# armv[67] is a bit special since we allow a soft-floating version via			# armv[67] is a bit special since we allow a soft-floating version via
	# CPUTYPE matching soft. This variant may not actually work though.			# CPUTYPE matching soft. This variant may not actually work though.
	.if ${MACHINE_ARCH:Marmv[67]*} != "" && \			.if ${MACHINE_ARCH:Marmv[67]*} != "" && \
	(!defined(CPUTYPE) \|\| ${CPUTYPE:Msoft} == "")			(!defined(CPUTYPE) \|\| ${CPUTYPE:Msoft} == "")
	CRTARCH?= armhf			CRTARCH?= armhf
	.else			.else
	CRTARCH?= ${MACHINE_CPUARCH:C/amd64/x86_64/}			CRTARCH?= ${MACHINE_ARCH:C/amd64/x86_64/}
				jhibbitsUnsubmitted Not Done Inline Actions Is this supposed to be a different change? powerpc isn't amd64. jhibbits: Is this supposed to be a different change? powerpc isn't amd64.
				pkubajAuthorUnsubmitted Done Inline Actions No, it's supposed to be here. The reason is that MACHINE_CPUARCH on both powerpc and powerpc64 are the same (powerpc). This means that 64-bit and 32-bit library will have the same name and during installworld 32-bit library will overwrite the 64-bit one. Changing to MACHINE_ARCH will mean libraries will have different names. pkubaj: No, it's supposed to be here. The reason is that MACHINE_CPUARCH on both powerpc and powerpc64…
				jhibbitsUnsubmitted Not Done Inline Actions Oh right, I don't know what I was thinking when I read that. jhibbits: Oh right, I don't know what I was thinking when I read that.
	.endif			.endif
	CRTSRC= ${SRCTOP}/contrib/compiler-rt			CRTSRC= ${SRCTOP}/contrib/compiler-rt

	.PATH: ${CRTSRC}/lib			.PATH: ${CRTSRC}/lib

	CLANGDIR= /usr/lib/clang/9.0.0			CLANGDIR= /usr/lib/clang/9.0.0
	LIBDIR= ${CLANGDIR}/lib/freebsd			LIBDIR= ${CLANGDIR}/lib/freebsd
	SHLIBDIR= ${LIBDIR}			SHLIBDIR= ${LIBDIR}
	Show All 26 Lines