diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2020-07-26 14:35:58 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2020-07-26 14:35:58 +0300 |
| commit | a5cc0427756754da6e84bf9427b9f404d157244e (patch) | |
| tree | ad0382d5c87971c30fa08c4b93b2b24a77b9252a | |
| parent | f64f8374a30150ac61281671e491cf256392baae (diff) | |
| parent | 3521bc11110fab2f7a1f1dc4dc35215eead02b2e (diff) | |
| download | egawk-a5cc0427756754da6e84bf9427b9f404d157244e.tar.gz egawk-a5cc0427756754da6e84bf9427b9f404d157244e.tar.bz2 egawk-a5cc0427756754da6e84bf9427b9f404d157244e.zip | |
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gawk
| -rw-r--r-- | pc/ChangeLog | 8 | ||||
| -rw-r--r-- | pc/Makefile | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 9f076b92..36cb0893 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,11 @@ +2020-07-25 Eli Zaretskii <eliz@gnu.org> + + * Makefile (mingw32, mingw32-readline, mingw32-mpfr) + (mingw32-readline-mpfr): Remove -lmsvcp60 from the linker command + line. That library is not freely redistributable, and linking + against it should no longer be necessary with latest MinGW runtime + versions. + 2020-04-25 Eli Zaretskii <eliz@gnu.org> * Makefile.ext: diff --git a/pc/Makefile b/pc/Makefile index 44ecbbaf..beafd3d6 100644 --- a/pc/Makefile +++ b/pc/Makefile @@ -200,28 +200,28 @@ mingw32: $(MAK) all \ CC=gcc O=.o CF="-D__USE_MINGW_ANSI_STDIO -O2 -gdwarf-2 -g3 -Wno-deprecated-declarations" \ OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \ - LF2="-lws2_32 -lmsvcp60" RSP= + LF2="-lws2_32" RSP= mingw32-readline: $(MAK) all \ CC=gcc O=.o \ CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_LIBREADLINE -O2 -gdwarf-2 -g3 -Wno-deprecated-declarations" \ OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \ - LF2="-lreadline -lws2_32 -lmsvcp60 -Wl,--enable-auto-import" RSP= + LF2="-lreadline -lws2_32 -Wl,--enable-auto-import" RSP= mingw32-mpfr: $(MAK) all \ CC=gcc O=.o \ CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_MPFR -O2 -gdwarf-2 -g3 -Wno-deprecated-declarations" \ OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \ - LF2="-lmpfr -lgmp -lws2_32 -lmsvcp60 -Wl,--enable-auto-import" RSP= + LF2="-lmpfr -lgmp -lws2_32 -Wl,--enable-auto-import" RSP= mingw32-readline-mpfr: $(MAK) all \ CC=gcc O=.o \ CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_LIBREADLINE -DHAVE_MPFR -O2 -gdwarf-2 -g3 -Wno-deprecated-declarations" \ OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \ - LF2="-lmpfr -lgmp -lreadline -lws2_32 -lmsvcp60 -Wl,--enable-auto-import" RSP= + LF2="-lmpfr -lgmp -lreadline -lws2_32 -Wl,--enable-auto-import" RSP= # Define BIND for BINDless compiles, otherwise $($(BIND)) may break. BIND = EMPTY |