aboutsummaryrefslogtreecommitdiffstats
path: root/src/s/gnu-linux.h
diff options
context:
space:
mode:
authorGlenn Morris2010-04-26 20:14:14 -0700
committerGlenn Morris2010-04-26 20:14:14 -0700
commit76cda504fbe7474fc404611a00764b3db703e650 (patch)
tree41bc0711c1d006e34dffe6f80cebf7c632b9071d /src/s/gnu-linux.h
parent7186fb09de6c3c4789aaa808a4f9af97b1cf14d4 (diff)
downloademacs-76cda504fbe7474fc404611a00764b3db703e650.tar.gz
emacs-76cda504fbe7474fc404611a00764b3db703e650.zip
Use $CRT_DIR in more places.
* configure.in (--with-crt-dir): Doc fix (now valid for all platforms). (CRT_DIR): On (powerpc64|sparc64)-*-linux-gnu*, default to /usr/lib64. On hpux10-20, default to /lib. * src/m/amdx86-64.h (START_FILES, LIB_STANDARD): Change the logic around, since the defaults (set by the system file) are fine in most cases. [GNU_LINUX, __OpenBSD__, __NetBSD__, __APPLE__]: Remove sections. * src/m/ibms390x.h (START_FILES, LIB_STANDARD): * src/m/macppc.h (START_FILES, LIB_STANDARD) [GNU_LINUX]: * src/m/sparc.h (START_FILES, LIB_STANDARD) [__linux__]: Remove definitions, since they are set correctly in s/gnu-linux.h. * src/s/freebsd.h (START_FILES, LIB_STANDARD): * src/s/gnu-linux.h (START_FILES, LIB_STANDARD): * src/s/hpux10-20.h (START_FILES): * src/s/netbsd.h (START_FILES, LIB_STANDARD, START_FILES_1, END_FILES_1): Use $CRT_DIR in place of fixed /usr/lib, /lib directories. * src/Makefile.in: Comment.
Diffstat (limited to 'src/s/gnu-linux.h')
-rw-r--r--src/s/gnu-linux.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index a55fbcb9821..3d470032efc 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -168,7 +168,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
168/* Ask GCC where to find libgcc.a. */ 168/* Ask GCC where to find libgcc.a. */
169#define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name` 169#define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
170 170
171#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o 171#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
172 172
173/* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option 173/* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option
174 says where to find X windows at run time. */ 174 says where to find X windows at run time. */
@@ -190,7 +190,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
190 190
191#undef LIB_GCC 191#undef LIB_GCC
192#define LIB_GCC 192#define LIB_GCC
193#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o 193#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
194 194
195/* _BSD_SOURCE is redundant, at least in glibc2, since we define 195/* _BSD_SOURCE is redundant, at least in glibc2, since we define
196 _GNU_SOURCE. Left in in case it's relevant to libc5 systems and 196 _GNU_SOURCE. Left in in case it's relevant to libc5 systems and