View | Details | Raw Unified | Return to bug 205250
Collapse All | Expand All

(-)b/gnu/usr.bin/binutils/Makefile (-1 / +5 lines)
Lines 7-17 SUBDIR= doc\ Link Here
7
	libbfd \
7
	libbfd \
8
	libopcodes \
8
	libopcodes \
9
	libbinutils \
9
	libbinutils \
10
	as \
10
	${_as} \
11
	ld \
11
	ld \
12
	${_objcopy} \
12
	${_objcopy} \
13
	objdump \
13
	objdump \
14
14
15
.if ${MK_AS} != "no"
16
_as=		as
17
.endif
18
15
.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
19
.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
16
_objcopy=	objcopy
20
_objcopy=	objcopy
17
.endif
21
.endif
(-)b/share/mk/src.opts.mk (-3 / +3 lines)
Lines 217-231 __TT=${MACHINE} Link Here
217
    ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386")
217
    ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386")
218
# Clang is enabled, and will be installed as the default /usr/bin/cc.
218
# Clang is enabled, and will be installed as the default /usr/bin/cc.
219
__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
219
__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
220
__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
220
__DEFAULT_NO_OPTIONS+=AS GCC GCC_BOOTSTRAP GNUCXX
221
.elif ${COMPILER_FEATURES:Mc++11} && ${__T:Mpowerpc*}
221
.elif ${COMPILER_FEATURES:Mc++11} && ${__T:Mpowerpc*}
222
# On powerpc, if an external compiler that supports C++11 is used as ${CC},
222
# On powerpc, if an external compiler that supports C++11 is used as ${CC},
223
# then Clang is enabled, but GCC is installed as the default /usr/bin/cc.
223
# then Clang is enabled, but GCC is installed as the default /usr/bin/cc.
224
__DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX
224
__DEFAULT_YES_OPTIONS+=AS CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX
225
__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
225
__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
226
.else
226
.else
227
# Everything else disables Clang, and uses GCC instead.
227
# Everything else disables Clang, and uses GCC instead.
228
__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
228
__DEFAULT_YES_OPTIONS+=AS GCC GCC_BOOTSTRAP GNUCXX
229
__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
229
__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
230
.endif
230
.endif
231
# In-tree binutils/gcc are older versions without modern architecture support.
231
# In-tree binutils/gcc are older versions without modern architecture support.
(-)b/tools/build/mk/OptionalObsoleteFiles.inc (+5 lines)
Lines 61-66 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz Link Here
61
OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
61
OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
62
.endif
62
.endif
63
63
64
.if ${MK_AS} == no
65
OLD_FILES+=usr/bin/as
66
OLD_FILES+=usr/share/man/man1/as.1.gz
67
.endif
68
64
.if ${MK_AT} == no
69
.if ${MK_AT} == no
65
OLD_FILES+=etc/pam.d/atrun
70
OLD_FILES+=etc/pam.d/atrun
66
OLD_FILES+=usr/bin/at
71
OLD_FILES+=usr/bin/at

Return to bug 205250