View | Details | Raw Unified | Return to bug 214864 | Differences between
and this patch

Collapse All | Expand All

(-)b/share/mk/src.opts.mk (-8 / +5 lines)
Lines 123-128 __DEFAULT_YES_OPTIONS = \ Link Here
123
    LIB32 \
123
    LIB32 \
124
    LIBPTHREAD \
124
    LIBPTHREAD \
125
    LIBTHR \
125
    LIBTHR \
126
    LLD \
127
    LLD_IS_LD \
126
    LOCALES \
128
    LOCALES \
127
    LOCATE \
129
    LOCATE \
128
    LPR \
130
    LPR \
Lines 221-238 __TT=${MACHINE} Link Here
221
.if ${COMPILER_FEATURES:Mc++11} && (${__T} == "aarch64" || \
223
.if ${COMPILER_FEATURES:Mc++11} && (${__T} == "aarch64" || \
222
    ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386")
224
    ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386")
223
# Clang is enabled, and will be installed as the default /usr/bin/cc.
225
# Clang is enabled, and will be installed as the default /usr/bin/cc.
224
__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD
226
__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
225
__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
227
__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
226
.elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "riscv64" && ${__T} != "sparc64"
228
.elif ${COMPILER_FEATURES:Mc++11} && ${__T} != "riscv64" && ${__T} != "sparc64"
227
# If an external compiler that supports C++11 is used as ${CC} and Clang
229
# If an external compiler that supports C++11 is used as ${CC} and Clang
228
# supports the target, then Clang is enabled but GCC is installed as the
230
# supports the target, then Clang is enabled but GCC is installed as the
229
# default /usr/bin/cc.
231
# default /usr/bin/cc.
230
__DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX
232
__DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX
231
__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC LLD
233
__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
232
.else
234
.else
233
# Everything else disables Clang, and uses GCC instead.
235
# Everything else disables Clang, and uses GCC instead.
234
__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
236
__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
235
__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC LLD
237
__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
236
.endif
238
.endif
237
# In-tree binutils/gcc are older versions without modern architecture support.
239
# In-tree binutils/gcc are older versions without modern architecture support.
238
.if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
240
.if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
Lines 249-259 __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND Link Here
249
.else
251
.else
250
__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
252
__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
251
.endif
253
.endif
252
.if ${__T} == "aarch64"
253
__DEFAULT_YES_OPTIONS+=LLD_IS_LD
254
.else
255
__DEFAULT_NO_OPTIONS+=LLD_IS_LD
256
.endif
257
.if ${__T} == "aarch64" || ${__T} == "amd64"
254
.if ${__T} == "aarch64" || ${__T} == "amd64"
258
__DEFAULT_YES_OPTIONS+=LLDB
255
__DEFAULT_YES_OPTIONS+=LLDB
259
.else
256
.else

Return to bug 214864