Skip to content

Commit

Permalink
src: clean-cut move to release/11.1.0
Browse files Browse the repository at this point in the history 
Taken from: FreeBSD
Commit ref: 2f4b735c66d
  • Loading branch information
@fichtner
fichtner committed Aug 20, 2017
1 parent 1bf5565 commit 3c09b4c
Show file tree
Hide file tree
Showing 15,173 changed files with 2,700,545 additions and 1,286,440 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion COPYRIGHT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The compilation of software known as FreeBSD is distributed under the
following terms:

Copyright (c) 1992-2016 The FreeBSD Project. All rights reserved.
Copyright (c) 1992-2017 The FreeBSD Project. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand Down
11 changes: 8 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@

# Note: we use this awkward construct to be compatible with FreeBSD's
# old make used in 10.0 and 9.2 and earlier.
.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && !make(showconfig)
.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && \
!make(showconfig) && !make(print-dir)
# targets/Makefile plays the role of top-level
.include "targets/Makefile"
.else
Expand All @@ -126,13 +127,13 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
installworld kernel-toolchain libraries lint maninstall \
obj objlink rerelease showconfig tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries \
_build-tools _compiler-metadata _cross-tools _includes _libraries \
build32 distribute32 install32 buildsoft distributesoft installsoft \
builddtb xdev xdev-build xdev-install \
xdev-links native-xtools stageworld stagekernel stage-packages \
create-world-packages create-kernel-packages create-packages \
packages installconfig real-packages sign-packages package-pkg \
test-system-compiler
print-dir test-system-compiler

# XXX: r156740: This can't work since bsd.subdir.mk is not included ever.
# It will only work for SUBDIR_TARGETS in make.conf.
Expand Down Expand Up @@ -257,6 +258,10 @@ _TARGET_ARCH= ${XDEV_ARCH}
_TARGET?= ${MACHINE}
_TARGET_ARCH?= ${MACHINE_ARCH}

.if make(print-dir)
.SILENT:
.endif

#
# Make sure we have an up-to-date make(1). Only world and buildworld
# should do this as those are the initial targets used for upgrades.
Expand Down
Loading

0 comments on commit 3c09b4c

Please sign in to comment.