Skip to content

Commit 78ca54b

Browse files
committed
configure: add more binutils variations
1 parent 3660453 commit 78ca54b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ if test -n "$CROSS_PREFIX"; then
131131
AC_MSG_ERROR([${CROSS_PREFIX}as not found, CROSS_PREFIX is wrong])
132132
fi
133133
else
134-
AC_PATH_PROGS([CROSS_AS], [i686-linux-gnu-as i386-elf-as])
134+
AC_PATH_PROGS([CROSS_AS], [i686-linux-gnu-as i686-unknown-linux-gnu-as i386-elf-as])
135135
fi
136136
if test -z "$CROSS_AS"; then
137137
AC_PATH_PROG([CROSS_AS], [x86_64-linux-gnu-as])
@@ -168,7 +168,7 @@ if test -n "$CROSS_PREFIX"; then
168168
AC_MSG_ERROR([${CROSS_PREFIX}ld not found, CROSS_PREFIX is wrong])
169169
fi
170170
else
171-
AC_PATH_PROGS([CROSS_LD], [i686-linux-gnu-ld i386-elf-ld x86_64-linux-gnu-ld ld.lld])
171+
AC_PATH_PROGS([CROSS_LD], [i686-linux-gnu-ld i686-unknown-linux-gnu-ld i386-elf-ld x86_64-linux-gnu-ld ld.lld])
172172
fi
173173
if test -z "$CROSS_LD"; then
174174
if test \( "$machine" = "i386" -o "$machine" = "x86_64" \) -a "$CONFIG_HOST" != "Darwin"; then
@@ -207,7 +207,7 @@ if test -n "$CROSS_PREFIX"; then
207207
AC_MSG_ERROR([${CROSS_PREFIX}ar not found, CROSS_PREFIX is wrong])
208208
fi
209209
else
210-
AC_PATH_PROGS([CROSS_AR], [i686-linux-gnu-ar i386-elf-ar x86_64-linux-gnu-ar llvm-ar], [], [$PATH${PATH_SEPARATOR}/usr/local/opt/llvm/bin])
210+
AC_PATH_PROGS([CROSS_AR], [i686-linux-gnu-ar i686-unknown-linux-gnu-ar i386-elf-ar x86_64-linux-gnu-ar llvm-ar], [], [$PATH${PATH_SEPARATOR}/usr/local/opt/llvm/bin])
211211
fi
212212
if test -z "$CROSS_AR"; then
213213
if test "$machine" = "i386" -o "$machine" = "x86_64"; then
@@ -224,7 +224,7 @@ if test -n "$CROSS_PREFIX"; then
224224
AC_MSG_ERROR([${CROSS_PREFIX}strip not found, CROSS_PREFIX is wrong])
225225
fi
226226
else
227-
AC_PATH_PROGS([CROSS_STRIP], [i686-linux-gnu-strip i386-elf-strip x86_64-linux-gnu-strip llvm-strip], [], [$PATH${PATH_SEPARATOR}/usr/local/opt/llvm/bin])
227+
AC_PATH_PROGS([CROSS_STRIP], [i686-linux-gnu-strip i686-unknown-linux-gnu-strip i386-elf-strip x86_64-linux-gnu-strip llvm-strip], [], [$PATH${PATH_SEPARATOR}/usr/local/opt/llvm/bin])
228228
fi
229229
if test -z "$CROSS_STRIP"; then
230230
if test "$machine" = "i386" -o "$machine" = "x86_64"; then
@@ -241,7 +241,7 @@ if test -n "$CROSS_PREFIX"; then
241241
AC_MSG_ERROR([${CROSS_PREFIX}objcopy not found, CROSS_PREFIX is wrong])
242242
fi
243243
else
244-
AC_PATH_PROGS([XOBJCOPY], [i686-linux-gnu-objcopy x86_64-linux-gnu-objcopy llvm-objcopy objcopy])
244+
AC_PATH_PROGS([XOBJCOPY], [i686-linux-gnu-objcopy i686-unknown-linux-gnu-objcopy x86_64-linux-gnu-objcopy llvm-objcopy objcopy])
245245
fi
246246

247247
AC_CHECK_PROGS([UCTAGS], [uctags ctags])

dj64.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ XLD_IMB = -Ttext-segment
2121
ifeq ($(CROSS_PREFIX),)
2222
CROSS_PREFIX := i686-linux-gnu-
2323
ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
24+
CROSS_PREFIX := i686-unknown-linux-gnu-
25+
ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
2426
CROSS_PREFIX := x86_64-linux-gnu-
2527
ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
2628
CROSS_PREFIX :=
2729
endif
2830
endif
31+
endif
2932
else ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
3033
# CROSS_PREFIX already set
3134
$(error invalid CROSS_PREFIX)

0 commit comments

Comments
 (0)