Skip to content
This repository was archived by the owner on Apr 13, 2024. It is now read-only.

Commit 0b1382b

Browse files
Merge pull request #159 from ClangBuiltLinux/nm
enable llvm-nm by default for all archs
2 parents d671e7d + dd58a23 commit 0b1382b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

driver.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eu
55
setup_variables() {
66
while [[ ${#} -ge 1 ]]; do
77
case ${1} in
8-
"AR="*|"ARCH="*|"CC="*|"LD="*|"OBJCOPY"=*|"REPO="*) export "${1?}" ;;
8+
"AR="*|"ARCH="*|"CC="*|"LD="*|"NM"=*|"OBJCOPY"=*|"REPO="*) export "${1?}" ;;
99
"-c"|"--clean") cleanup=true ;;
1010
"-j"|"--jobs") shift; jobs=$1 ;;
1111
"-j"*) jobs=${1/-j} ;;
@@ -191,6 +191,12 @@ check_dependencies() {
191191
fi
192192
check_objcopy_version
193193
${OBJCOPY} --version
194+
195+
if [[ -z "${NM:-}" ]]; then
196+
for NM in llvm-nm-9 llvm-nm-8 llvm-nm-7 llvm-nm "${CROSS_COMPILE:-}"nm; do
197+
command -v ${NM} 2>/dev/null && break
198+
done
199+
fi
194200
}
195201

196202
# Optimistically check to see that the user has a llvm-ar
@@ -241,7 +247,8 @@ mako_reactor() {
241247
KBUILD_BUILD_TIMESTAMP="Thu Jan 1 00:00:00 UTC 1970" \
242248
KBUILD_BUILD_USER=driver \
243249
KBUILD_BUILD_HOST=clangbuiltlinux \
244-
make -j"${jobs:-$(nproc)}" CC="${CC}" HOSTCC="${CC}" LD="${LD}" HOSTLD="${HOSTLD:-ld}" AR="${AR}" OBJCOPY="${OBJCOPY}" "${@}"
250+
make -j"${jobs:-$(nproc)}" CC="${CC}" HOSTCC="${CC}" LD="${LD}" \
251+
HOSTLD="${HOSTLD:-ld}" AR="${AR}" OBJCOPY="${OBJCOPY}" NM="${NM}" "${@}"
245252
}
246253

247254
apply_patches() {

0 commit comments

Comments
 (0)