diff options
author | Warner Losh <imp@FreeBSD.org> | 2020-03-20 16:00:26 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2020-03-20 16:00:26 +0000 |
commit | 5e029bd7885ab2b8f735411954f947335566f578 (patch) | |
tree | ae6e36a425d4e951c5f73686ab436f6b538e7ed1 /share/mk/src.opts.mk | |
parent | 05ab65497e06edd12683163480841aa9630b9d4c (diff) | |
download | src-5e029bd7885ab2b8f735411954f947335566f578.tar.gz src-5e029bd7885ab2b8f735411954f947335566f578.zip |
Revert r359164.
This was in my staging tree by mistake when I pushed. Revert until it's ready.
Notes
Notes:
svn path=/head/; revision=359167
Diffstat (limited to 'share/mk/src.opts.mk')
-rw-r--r-- | share/mk/src.opts.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 653e0bc5a3fa..e32d10d9a1e6 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -256,6 +256,11 @@ __T=${TARGET_ARCH} .else __T=${MACHINE_ARCH} .endif +.if defined(TARGET) +__TT=${TARGET} +.else +__TT=${MACHINE} +.endif # All supported backends for LLVM_TARGET_XXX __LLVM_TARGETS= \ @@ -265,13 +270,13 @@ __LLVM_TARGETS= \ powerpc \ riscv \ x86 -__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:S/powerpc64/powerpc/:S/powerpcspe/powerpc/ +__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:S/arm64/aarch64/:S/powerpc64/powerpc/ .for __llt in ${__LLVM_TARGETS} # Default enable the given TARGET's LLVM_TARGET support -.if ${__T:${__LLVM_TARGET_FILT}} == ${__llt} +.if ${__TT:${__LLVM_TARGET_FILT}} == ${__llt} __DEFAULT_YES_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu} # aarch64 needs arm for -m32 support. -.elif ${__T} == "aarch64" && ${__llt:Marm*} != "" +.elif ${__TT} == "arm64" && ${__llt} == "arm" __DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_ARM/LLVM_TARGET_AARCH64 # Default the rest of the LLVM_TARGETs to the value of MK_LLVM_TARGET_ALL. .else @@ -283,7 +288,7 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF .include <bsd.compiler.mk> -.if ${__T:Mmips*} == "" +.if ${__TT} != "mips" # Clang is installed as the default /usr/bin/cc. __DEFAULT_YES_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC .else @@ -302,7 +307,7 @@ __DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=OFED .endif -.if ${__T:Mmips*} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" +.if ${__TT} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD .else __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD |