Merge pull request #50 from mnhauke/master

configure: add SUSE specific bintools variation

Author: stsp

configure.ac

@@ -136,7 +136,7 @@ if test -n "$CROSS_PREFIX"; then
     AC_MSG_ERROR([${CROSS_PREFIX}as not found, CROSS_PREFIX is wrong])
   fi
 else
-  AC_PATH_PROGS([CROSS_AS], [i686-linux-gnu-as i686-unknown-linux-gnu-as i386-elf-as])
+  AC_PATH_PROGS([CROSS_AS], [i686-linux-gnu-as i686-unknown-linux-gnu-as i586-suse-linux-as i386-elf-as])
 fi
 if test -z "$CROSS_AS"; then
   AC_PATH_PROG([CROSS_AS], [x86_64-linux-gnu-as])
@@ -173,7 +173,7 @@ if test -n "$CROSS_PREFIX"; then
     AC_MSG_ERROR([${CROSS_PREFIX}ld not found, CROSS_PREFIX is wrong])
   fi
 else
-  AC_PATH_PROGS([CROSS_LD], [i686-linux-gnu-ld i686-unknown-linux-gnu-ld i386-elf-ld x86_64-linux-gnu-ld ld.lld])
+  AC_PATH_PROGS([CROSS_LD], [i686-linux-gnu-ld i686-unknown-linux-gnu-ld i586-suse-linux-ld i386-elf-ld x86_64-linux-gnu-ld ld.lld])
 fi
 if test -z "$CROSS_LD"; then
   if test \( "$machine" = "i386" -o "$machine" = "x86_64" \) -a "$CONFIG_HOST" != "Darwin"; then
@@ -212,7 +212,7 @@ if test -n "$CROSS_PREFIX"; then
     AC_MSG_ERROR([${CROSS_PREFIX}ar not found, CROSS_PREFIX is wrong])
   fi
 else
-  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])
+  AC_PATH_PROGS([CROSS_AR], [i686-linux-gnu-ar i686-unknown-linux-gnu-ar i586-suse-linux-ar i386-elf-ar x86_64-linux-gnu-ar llvm-ar], [], [$PATH${PATH_SEPARATOR}/usr/local/opt/llvm/bin])
 fi
 if test -z "$CROSS_AR"; then
   if test "$machine" = "i386" -o "$machine" = "x86_64"; then
@@ -229,7 +229,7 @@ if test -n "$CROSS_PREFIX"; then
     AC_MSG_ERROR([${CROSS_PREFIX}strip not found, CROSS_PREFIX is wrong])
   fi
 else
-  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])
+  AC_PATH_PROGS([CROSS_STRIP], [i686-linux-gnu-strip i686-unknown-linux-gnu-strip i586-suse-linux-strip i386-elf-strip x86_64-linux-gnu-strip llvm-strip], [], [$PATH${PATH_SEPARATOR}/usr/local/opt/llvm/bin])
 fi
 if test -z "$CROSS_STRIP"; then
   if test "$machine" = "i386" -o "$machine" = "x86_64"; then
@@ -246,7 +246,7 @@ if test -n "$CROSS_PREFIX"; then
     AC_MSG_ERROR([${CROSS_PREFIX}objcopy not found, CROSS_PREFIX is wrong])
   fi
 else
-  AC_PATH_PROGS([XOBJCOPY], [i686-linux-gnu-objcopy i686-unknown-linux-gnu-objcopy x86_64-linux-gnu-objcopy llvm-objcopy objcopy])
+  AC_PATH_PROGS([XOBJCOPY], [i686-linux-gnu-objcopy i686-unknown-linux-gnu-objcopy i586-suse-linux-objcopy x86_64-linux-gnu-objcopy llvm-objcopy objcopy])
 fi
 
 AC_CHECK_PROGS([UCTAGS], [uctags ctags])

dj64.mk

@@ -5,7 +5,7 @@ $(error unknown target architecture)
 endif
 OS = $(shell uname -s)
 NATIVE=0
-ifneq ($(filter x86_64 amd64 i686 i386,$(MACH)),)
+ifneq ($(filter x86_64 amd64 i686 i586 i386,$(MACH)),)
 ifneq ($(OS), Darwin)
 NATIVE = 1
 endif
@@ -23,12 +23,15 @@ CROSS_PREFIX := i686-linux-gnu-
 ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
 CROSS_PREFIX := i686-unknown-linux-gnu-
 ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
+CROSS_PREFIX := i586-suse-linux-
+ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
 CROSS_PREFIX := x86_64-linux-gnu-
 ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
 CROSS_PREFIX :=
 endif
 endif
 endif
+endif
 else ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
 # CROSS_PREFIX already set
 $(error invalid CROSS_PREFIX)