diff options
author | Viktor Szakats <commit@vsz.me> | 2022-10-27 06:45:32 +0000 |
---|---|---|
committer | Viktor Szakats <commit@vsz.me> | 2022-10-27 06:45:32 +0000 |
commit | b7260c4fda95196b2fa16f32b5913f25323e5098 (patch) | |
tree | d494ad5ef4d49a9d150cee92241aeb9a0e31eb6a | |
parent | 811c799f2db1bbcf22e7ceee1e8c2c21525274de (diff) | |
download | curl-b7260c4fda95196b2fa16f32b5913f25323e5098.tar.gz |
windows: fix linking .rc to shared curl with autotools
`./configure --enable-shared --disable-static` fails when trying to link
a shared `curl.exe`, due to `libtool` magically changing the output
filename of `windres` to one that it doesn't find when linking:
```
/bin/sh ../libtool --tag=RC --mode=compile windres -I../../curl/include -DCURL_EMBED_MANIFEST -i ../../curl/src/curl.rc -o curl.o
libtool: compile: windres -I../../curl/include -DCURL_EMBED_MANIFEST -i ../../curl/src/curl.rc -o .libs/curl.o
[...]
CCLD curl.exe
clang: error: no such file or directory: 'curl.o'
```
Let's resolve this by skipping `libtool` and calling `windres` directly
when building `src` (aka `curl.exe`). Leave `lib` unchanged, as it does
need the `libtool` magic. This solution is compatible with building
a static `curl.exe`.
This build scenario is not CI-tested.
While here, delete an obsolete comment about a permanent `libtool`
warning that we've resolved earlier.
Regression from 6de7322c03d5b4d91576a7d9fc893e03cc9d1057
Reported-by: Christoph Reiter
Fixes #9803
Closes #9805
-rw-r--r-- | lib/Makefile.am | 1 | ||||
-rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 5d2df8bff..cd1ca97a5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -155,7 +155,6 @@ optiontable: perl optiontable.pl < $(top_srcdir)/include/curl/curl.h > easyoptions.c if OS_WINDOWS -# Warning is "normal": libtool: error: ignoring unknown tag RC .rc.lo: $(LIBTOOL) --tag=RC --mode=compile $(RC) -I$(top_srcdir)/include $(RCFLAGS) -i $< -o $@ endif diff --git a/src/Makefile.am b/src/Makefile.am index d9180b0b1..2c1886f5a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -157,7 +157,6 @@ listhelp: (cd $(top_srcdir)/docs/cmdline-opts && ./gen.pl listhelp *.d) > tool_listhelp.c if OS_WINDOWS -# Warning is "normal": libtool: error: ignoring unknown tag RC .rc.o: - $(LIBTOOL) --tag=RC --mode=compile $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ + $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ endif |