From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 26 Nov 2006 22:16:49 +0000 (+0000)
Subject: Look for standard libs in /usr/lib64 only if that directory exists.
X-Git-Tag: emacs-pretest-22.0.92~492
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21e0cf968e35b2e3df6b23bf3fe01e9c5c3f56e8;p=emacs.git

Look for standard libs in /usr/lib64 only if that directory exists.
---

diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 419fa131692..940ff70dbda 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -128,7 +128,11 @@ Boston, MA 02110-1301, USA.  */
 #else /* !__OpenBSD__ && !__FreeBSD__ */
 
 #undef START_FILES
+#ifdef HAVE_X86_64_LIB64_DIR
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+#else
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+#endif
 
 /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD.
    The reason is that some functions in libgcc.a call functions from libc.a,
@@ -136,7 +140,11 @@ Boston, MA 02110-1301, USA.  */
    versions of ld are one-pass linkers, we need to mention -lgcc twice,
    or else we risk getting unresolved externals.  */
 #undef LIB_STANDARD
+#ifdef HAVE_X86_64_LIB64_DIR
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+#else
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+#endif
 
 #endif /* __FreeBSD__ */