diff options
| author | Chong Yidong | 2006-11-26 22:16:49 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-11-26 22:16:49 +0000 |
| commit | 21e0cf968e35b2e3df6b23bf3fe01e9c5c3f56e8 (patch) | |
| tree | 0f1d9efbf2baab1fba6eb4e5f55237e463b919c3 /src/m | |
| parent | fb873e6b9b52b39b0659c0ca91a621903e52de38 (diff) | |
| download | emacs-21e0cf968e35b2e3df6b23bf3fe01e9c5c3f56e8.tar.gz emacs-21e0cf968e35b2e3df6b23bf3fe01e9c5c3f56e8.zip | |
Look for standard libs in /usr/lib64 only if that directory exists.
Diffstat (limited to 'src/m')
| -rw-r--r-- | src/m/amdx86-64.h | 8 |
1 files changed, 8 insertions, 0 deletions
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. */ | |||
| 128 | #else /* !__OpenBSD__ && !__FreeBSD__ */ | 128 | #else /* !__OpenBSD__ && !__FreeBSD__ */ |
| 129 | 129 | ||
| 130 | #undef START_FILES | 130 | #undef START_FILES |
| 131 | #ifdef HAVE_X86_64_LIB64_DIR | ||
| 131 | #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o | 132 | #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o |
| 133 | #else | ||
| 134 | #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o | ||
| 135 | #endif | ||
| 132 | 136 | ||
| 133 | /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. | 137 | /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. |
| 134 | The reason is that some functions in libgcc.a call functions from libc.a, | 138 | The reason is that some functions in libgcc.a call functions from libc.a, |
| @@ -136,7 +140,11 @@ Boston, MA 02110-1301, USA. */ | |||
| 136 | versions of ld are one-pass linkers, we need to mention -lgcc twice, | 140 | versions of ld are one-pass linkers, we need to mention -lgcc twice, |
| 137 | or else we risk getting unresolved externals. */ | 141 | or else we risk getting unresolved externals. */ |
| 138 | #undef LIB_STANDARD | 142 | #undef LIB_STANDARD |
| 143 | #ifdef HAVE_X86_64_LIB64_DIR | ||
| 139 | #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o | 144 | #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o |
| 145 | #else | ||
| 146 | #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o | ||
| 147 | #endif | ||
| 140 | 148 | ||
| 141 | #endif /* __FreeBSD__ */ | 149 | #endif /* __FreeBSD__ */ |
| 142 | 150 | ||