diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-04-23 19:23:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-04-23 19:23:22 -0700 |
| commit | 70eab5c1825a15ead8010be9aafc1d72486fd07d (patch) | |
| tree | b367b1618a94b8fbaa78ddd337452119becf580d /src/m | |
| parent | fea1add44802d318b71d0aa2f35740f1d8640d26 (diff) | |
| download | emacs-70eab5c1825a15ead8010be9aafc1d72486fd07d.tar.gz | |
Close bug#5655.
* configure.in (CRT_DIR): New output variable.
(--with-crt-dir): New option. (Bug#5655)
(HAVE_LIB64_DIR): Remove.
* src/Makefile.in (CRT_DIR): New variable, set by configure.
* src/m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD):
Use $CRT_DIR rather than HAVE_LIB64_DIR. (Bug#5655)
Diffstat (limited to 'src/m')
| -rw-r--r-- | src/m/ibms390x.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h index 9429e4282bf..ea0fa11ec3f 100644 --- a/src/m/ibms390x.h +++ b/src/m/ibms390x.h @@ -91,18 +91,10 @@ NOTE-END */ #define XPNTR(a) XUINT (a) #undef START_FILES -#ifdef HAVE_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 +#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o #undef LIB_STANDARD -#ifdef HAVE_LIB64_DIR -#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o -#else -#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o -#endif +#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519 (do not change this comment) */ |