[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0db7db3: Fix compilation of lib-src executables on
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 0db7db3: Fix compilation of lib-src executables on MS-Windows. |
Date: |
Sat, 27 Dec 2014 19:48:18 +0000 |
branch: master
commit 0db7db3090df8d5afd5fda176511fea8656f1930
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix compilation of lib-src executables on MS-Windows.
lib-src/Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT})
(make-docfile${EXEEXT}, movemail${EXEEXT})
(update-game-score${EXEEXT}): Put $(NTLIB) before $(LOADLIBES),
since GCC sometimes calls stpcpy when it sees strcpy, under
optimization switches. Reported by Dani Moncayo <address@hidden>.
---
lib-src/ChangeLog | 8 ++++++++
lib-src/Makefile.in | 12 ++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 600cc67..07a72ec 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-27 Eli Zaretskii <address@hidden>
+
+ * Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT})
+ (make-docfile${EXEEXT}, movemail${EXEEXT})
+ (update-game-score${EXEEXT}): Put $(NTLIB) before $(LOADLIBES),
+ since GCC sometimes calls stpcpy when it sees strcpy, under
+ optimization switches.
+
2014-12-14 Paul Eggert <address@hidden>
* etags.c (analyze_regex): Rename from analyse_regex.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index cae0898..13a7a05 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -321,7 +321,7 @@ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h
$(config_h)
etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
-etags_libs = regex.o $(LOADLIBES) $(NTLIB)
+etags_libs = regex.o $(NTLIB) $(LOADLIBES)
etags${EXEEXT}: ${etags_deps}
$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
@@ -336,18 +336,18 @@ ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
$(config_h)
$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
- $< $(LOADLIBES) $(NTLIB) -o $@
+ $< $(NTLIB) $(LOADLIBES) -o $@
profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
- $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@
+ $(NTLIB) $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o $@
make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
- $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@
+ $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(NTLIB) $(LOADLIBES) -o $@
movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
- $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@
+ $(NTLIB) $(LOADLIBES) $(LIBS_MOVE) -o $@
pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h)
$(AM_V_CC)$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $<
@@ -378,7 +378,7 @@ hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h)
update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
$(AM_V_CCLD)$(CC) ${ALL_CFLAGS} \
-DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
- $< $(LOADLIBES) $(NTLIB) -o $@
+ $< $(NTLIB) $(LOADLIBES) -o $@
emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
$(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0db7db3: Fix compilation of lib-src executables on MS-Windows.,
Eli Zaretskii <=