Move llvm Options.inc hack from r321433 for NO_CLEAN to lib/clang/libllvm.
The files are only ever generated to .OBJDIR, not to WORLDTMP (as a sysroot) and are only ever included from a compilation. So using a beforebuild target here removes the file before the compilation tries to include it. MFC after: 2 months X-MFC-With: r321369
This commit is contained in:
parent
cf8eb490f5
commit
cd2831005b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=321439
@ -813,16 +813,6 @@ _worldtmp: .PHONY
|
|||||||
${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*
|
${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*
|
||||||
.endif
|
.endif
|
||||||
.endfor
|
.endfor
|
||||||
# 20170724 remove stale lib/clang/libllvm/Options.inc file, of which there are
|
|
||||||
# two different versions after r308421, one for llvm-lib, one for llvm-dlltool
|
|
||||||
.for d in ${OBJTREE} ${WORLDTMP}
|
|
||||||
.for f in ${d}${.CURDIR}/lib/clang/libllvm/Options.inc
|
|
||||||
.if exists(${f}) || exists(${f}.d)
|
|
||||||
@echo Removing stale generated ${f} files
|
|
||||||
@rm -f ${f} ${f}.d
|
|
||||||
.endif
|
|
||||||
.endfor
|
|
||||||
.endfor
|
|
||||||
.for _dir in \
|
.for _dir in \
|
||||||
lib lib/casper usr legacy/bin legacy/usr
|
lib lib/casper usr legacy/bin legacy/usr
|
||||||
mkdir -p ${WORLDTMP}/${_dir}
|
mkdir -p ${WORLDTMP}/${_dir}
|
||||||
|
@ -1302,6 +1302,16 @@ llvm-dlltool/Options.inc: ${LLVM_SRCS}/lib/ToolDrivers/llvm-dlltool/Options.td
|
|||||||
TGHDRS+= llvm-dlltool/Options.inc
|
TGHDRS+= llvm-dlltool/Options.inc
|
||||||
CFLAGS.DlltoolDriver.cpp+= -I${.OBJDIR}/llvm-dlltool
|
CFLAGS.DlltoolDriver.cpp+= -I${.OBJDIR}/llvm-dlltool
|
||||||
|
|
||||||
|
beforebuild:
|
||||||
|
# 20170724 remove stale Options.inc file, of which there are two different
|
||||||
|
# versions after r308421, one for llvm-lib, one for llvm-dlltool
|
||||||
|
.for f in Options.inc
|
||||||
|
.if exists(${f}) || exists(${f}.d)
|
||||||
|
@echo Removing stale generated ${f} files
|
||||||
|
@rm -f ${f} ${f}.d
|
||||||
|
.endif
|
||||||
|
.endfor
|
||||||
|
|
||||||
# Note: some rules are superfluous, not every combination is valid.
|
# Note: some rules are superfluous, not every combination is valid.
|
||||||
.for arch in \
|
.for arch in \
|
||||||
AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
|
AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
|
||||||
|
Loading…
Reference in New Issue
Block a user