diff --git a/share/mk/local.autodep.mk b/share/mk/local.autodep.mk index 0e14d844fcff..6c2b560b1f45 100644 --- a/share/mk/local.autodep.mk +++ b/share/mk/local.autodep.mk @@ -1,29 +1,31 @@ # $FreeBSD$ .if ${.MAKE.DEPENDFILE:M*.${MACHINE}} == "" # by default only MACHINE0 does updates UPDATE_DEPENDFILE_MACHINE?= ${MACHINE0:U${MACHINE}} .if ${MACHINE} != ${UPDATE_DEPENDFILE_MACHINE} UPDATE_DEPENDFILE= no .endif .endif NOSSPPICO?= .nossppico PIEO?= .pieo OBJ_EXTENSIONS+= ${NOSSPPICO} ${PIEO} CFLAGS+= ${CFLAGS_LAST} CXXFLAGS+= ${CXXFLAGS_LAST} LDFLAGS+= ${LDFLAGS_LAST} CLEANFILES+= .depend # handy for debugging .SUFFIXES: .S .c .cc .cpp .cpp-out .S.cpp-out .c.cpp-out: .NOMETA @${CC} -E ${CFLAGS} ${.IMPSRC} | grep -v '^[[:space:]]*$$' .cc.cpp-out: .NOMETA @${CXX} -E ${CXXFLAGS} ${.IMPSRC} | grep -v '^[[:space:]]*$$' + +.-include diff --git a/share/mk/local.gendirdeps.mk b/share/mk/local.gendirdeps.mk index 3ec2be4cc865..c8aa3ce05910 100644 --- a/share/mk/local.gendirdeps.mk +++ b/share/mk/local.gendirdeps.mk @@ -1,72 +1,74 @@ # $FreeBSD$ # we need a keyword, this noise is to prevent it being expanded GENDIRDEPS_HEADER= echo '\# ${FreeBSD:L:@v@$$$v$$ @:M*F*}'; # suppress optional/auto dependencies # local.dirdeps.mk will put them in if necessary GENDIRDEPS_FILTER+= \ Nbin/cat.host \ Nlib/libssp_nonshared \ Ncddl/usr.bin/ctf* \ Nlib/libc_nonshared \ Nlib/libgcc_eh \ Nlib/libgcc_s \ Nstand/libsa/* \ Nstand/libsa32/* \ Ntargets/pseudo/stage* \ Ntools/* # Clang has nested directories in its OBJDIR. GENDIRDEPS_FILTER+= C,(lib/clang/lib[^/]*)/.*,\1, # Exclude toolchain which is handled special. .if ${RELDIR:Mtargets*} == "" .if ${RELDIR:Nusr.bin/clang/*:Ngnu/usr.bin/cc/*:Nlib/clang*} != "" GENDIRDEPS_FILTER.host+= \ Nusr.bin/clang/* \ Ngnu/usr.bin/cc/* \ .endif GENDIRDEPS_FILTER_HOST_TOOLS+= \ Nlib/clang/headers \ Nusr.bin/addr2line \ Nusr.bin/ar \ Nusr.bin/clang/clang \ Nusr.bin/elfcopy \ Nusr.bin/elfdump \ Nusr.bin/nm \ Nusr.bin/readelf \ Nusr.bin/size \ Nusr.bin/strings \ Nusr.bin/strip \ Ngnu/usr.bin/cc* \ Ngnu/usr.bin/binutils* \ .if ${MACHINE} != "host" GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_HOST_TOOLS:C,$,.host,} .else GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_HOST_TOOLS} .endif .endif GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER.${MACHINE}:U} # gendirdeps.mk will turn _{VAR} into ${VAR} which keeps this simple # order of this list matters! GENDIRDEPS_FILTER_DIR_VARS+= \ CSU_DIR \ BOOT_MACHINE_DIR # order of this list matters! GENDIRDEPS_FILTER_VARS+= \ KERNEL_NAME \ MACHINE_CPUARCH \ MACHINE_ARCH \ MACHINE GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_DIR_VARS:@v@S,${$v},_{${v}},@} GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_VARS:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u} # avoid churn for now LOCAL_DEPENDS_GUARD= _{DEP_RELDIR} == _{_DEP_RELDIR} + +.-include