aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSven Joachim2012-01-12 18:41:16 +0800
committerChong Yidong2012-01-12 18:41:16 +0800
commit39ac32998179359c74f49be6564f11acf4db8b20 (patch)
tree3ee7004eae003f758929143aaa7c09c7a1ad961d /src
parent177f1b0e21fa9454def19912d1e257d40619d59f (diff)
downloademacs-39ac32998179359c74f49be6564f11acf4db8b20.tar.gz
emacs-39ac32998179359c74f49be6564f11acf4db8b20.zip
* src/s/gnu-linux.h: Use CRT_DIR.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/s/gnu-linux.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8f81cc78ed2..62554190500 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-01-12 Sven Joachim <svenjoac@gmx.de>
2
3 * s/gnu-linux.h: Use CRT_DIR.
4
12011-11-11 Johan Bockgård <bojohan@gnu.org> 52011-11-11 Johan Bockgård <bojohan@gnu.org>
2 6
3 * xdisp.c (fill_composite_glyph_string): Always set s->face, to 7 * xdisp.c (fill_composite_glyph_string): Always set s->face, to
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 9d4b66ca684..9863995169d 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. */
@@ -198,7 +198,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
198#define LIBS_DEBUG 198#define LIBS_DEBUG
199#undef LIB_GCC 199#undef LIB_GCC
200#define LIB_GCC 200#define LIB_GCC
201#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o 201#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
202 202
203/* Don't use -g in test compiles in configure. 203/* Don't use -g in test compiles in configure.
204 This is so we will use the same shared libs for that linking 204 This is so we will use the same shared libs for that linking