Commit 8da1f6e9 authored by Shawn Webb's avatar Shawn Webb
Browse files

HBSD: Migrate to the new MK_LLVM_BINUTILS


Signed-off-by: Shawn Webb's avatarShawn Webb <shawn.webb@hardenedbsd.org>
parent 1c1e8ee3
......@@ -130,6 +130,7 @@ __DEFAULT_YES_OPTIONS = \
LLD_BOOTSTRAP \
LLD_IS_LD \
LLVM_ASSERTIONS \
LLVM_BINUTILS \
LLVM_COV \
LLVM_CXXFILT \
LOADER_GELI \
......@@ -208,7 +209,6 @@ __DEFAULT_NO_OPTIONS = \
LOADER_FIREWIRE \
LOADER_VERBOSE \
LOADER_VERIEXEC_PASS_MANIFEST \
LLVM_BINUTILS \
MALLOC_PRODUCTION \
OFED \
OFED_EXTRA \
......@@ -342,15 +342,9 @@ __DEFAULT_NO_OPTIONS+=LTOLIB
.if ${__T} == "amd64" || ${__T} == "aarch64"
__DEFAULT_YES_OPTIONS+=CFI
__DEFAULT_YES_OPTIONS+=CLANG_EXTRAS
__DEFAULT_YES_OPTIONS+=LLVM_AR_IS_AR
__DEFAULT_YES_OPTIONS+=LLVM_NM_IS_NM
__DEFAULT_YES_OPTIONS+=LLVM_OBJDUMP_IS_OBJDUMP
.else
__DEFAULT_NO_OPTIONS+=CFI
__DEFAULT_NO_OPTIONS+=CLANG_EXTRAS
__DEFAULT_NO_OPTIONS+=LLVM_AR_IS_AR
__DEFAULT_NO_OPTIONS+=LLVM_NM_IS_NM
__DEFAULT_NO_OPTIONS+=LLVM_OBJDUMP_IS_OBJDUMP
.endif
# OFW is only for powerpc, exclude others
......
......@@ -16,7 +16,7 @@ CFLAGS+=-I. -I${.CURDIR}
NO_SHARED?= yes
.endif
.if ${MK_LLVM_AR_IS_AR} == "no"
.if ${MK_LLVM_BINUTILS} == "no"
SYMLINKS= ${BINDIR}/elftc-ar ${BINDIR}/ranlib \
${BINDIR}/elftc-ar ${BINDIR}/ar
.else
......
......@@ -21,7 +21,7 @@ CFLAGS+= -DWITH_CASPER
CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common
.if ${MK_LLVM_NM_IS_NM} == "no"
.if ${MK_LLVM_BINUTILS} == "no"
SYMLINKS= ${BINDIR}/elftc-nm ${BINDIR}/nm
.endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment