diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2002-01-30 18:40:27 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2002-01-30 18:40:27 +0000 |
| commit | 5b119e8ad657049115a40336143bcd30b912b268 (patch) | |
| tree | ba2468b6556c576703ba38b77e956b6c127d63fd | |
| parent | 43a72a93f62543ff47a1e40f5b7a3ba3bd1f9961 (diff) | |
use defined(__ELF__) instead of a list of ELF architectures from which
sparc64 was missing.
This fixes a bug with ELF static libraries on sparc64
| -rw-r--r-- | usr.bin/make/arch.c | 5 | ||||
| -rw-r--r-- | usr.bin/make/config.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index 21fa4ebe9ef..77bfe6f2ac6 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: arch.c,v 1.50 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: arch.c,v 1.51 2002/01/30 18:40:26 matthieu Exp $ */ /* $NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $ */ /* @@ -161,8 +161,7 @@ static TIMESTAMP ArchMTimeMember(const char *, const char *, bool); static FILE *ArchFindMember(const char *, const char *, struct ar_hdr *, const char *); static void ArchTouch(const char *, const char *); #if defined(__svr4__) || defined(__SVR4) || \ - (defined(__OpenBSD__) && defined(__mips__)) || \ - (defined(__OpenBSD__) && defined(__powerpc)) + (defined(__OpenBSD__) && defined(__ELF__)) #define SVR4ARCHIVES #endif diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h index a5f9e27af75..0ffd60b7ddc 100644 --- a/usr.bin/make/config.h +++ b/usr.bin/make/config.h @@ -2,7 +2,7 @@ #define CONFIG_H /* $OpenPackages$ */ -/* $OpenBSD: config.h,v 1.12 2001/06/05 11:59:11 espie Exp $ */ +/* $OpenBSD: config.h,v 1.13 2002/01/30 18:40:26 matthieu Exp $ */ /* $NetBSD: config.h,v 1.7 1996/11/06 17:59:03 christos Exp $ */ /* @@ -107,8 +107,7 @@ */ #define SUNSHCMD -#if !defined(__svr4__) && !defined(__SVR4) && !defined(__alpha__) && \ - !defined(__mips__) && !defined(__powerpc__) +#if !defined(__svr4__) && !defined(__SVR4) && !defined(__ELF__) # ifndef RANLIBMAG # define RANLIBMAG "__.SYMDEF" # endif |