mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.m32: add CURL_RC and CURL_STRIP variables [ci skip]

Browse Source 
They allow to override the hardcoded values for the `windres` and `strip`
tools, complementing the existing set of `CURL_{CC,AR,RANLIB}` variables.

`CURL_RC` comes handy when using LLVM tools with `CROSSPREFIX=llvm-` and
`CURL_CC=clang` set on current latest debian:unstable or earlier, where
`llvm-windres` is missing, and a `CURL_RC=<triplet>-windres` fixes it.
Hopefully this will be fixed in the llvm package. FWIW `llvm-windres`
does exist in Homebrew llvm, MSYS2 llvm and llvm-mingw.

Reviewed-by: Daniel Stenberg
Closes #9132
This commit is contained in:
Viktor Szakats 2022-07-10 22:28:14 +00:00
parent 4989cd099e
commit 1d5b7b7009
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/examples/Makefile.m32
View File

@ -113,11 +113,14 @@ endif
ifeq ($(CURL_AR),)
CURL_AR := $(CROSSPREFIX)ar
endif
ifeq ($(CURL_RC),)
CURL_RC := $(CROSSPREFIX)windres
endif
CC = $(CURL_CC)
CFLAGS = -O3 $(CURL_CFLAG_EXTRAS) -W -Wall
LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE)
RC = $(CROSSPREFIX)windres
RC = $(CURL_RC)
RCFLAGS = --include-dir=$(PROOT)/include -O coff $(CURL_RCFLAG_EXTRAS)
# Set environment var ARCH to your architecture to override autodetection.

10
lib/Makefile.m32
View File

@ -108,15 +108,21 @@ endif
ifeq ($(CURL_RANLIB),)
CURL_RANLIB := $(CROSSPREFIX)ranlib
endif
ifeq ($(CURL_RC),)
CURL_RC := $(CROSSPREFIX)windres
endif
ifeq ($(CURL_STRIP),)
CURL_STRIP := $(CROSSPREFIX)strip
endif
CC = $(CURL_CC)
CFLAGS = -O3 $(CURL_CFLAG_EXTRAS) -W -Wall
LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL)
AR = $(CURL_AR)
RANLIB = $(CURL_RANLIB)
RC = $(CROSSPREFIX)windres
RC = $(CURL_RC)
RCFLAGS = --include-dir=$(PROOT)/include -O coff $(CURL_RCFLAG_EXTRAS)
STRIP = $(CROSSPREFIX)strip -g
STRIP = $(CURL_STRIP) -g
# Set environment var ARCH to your architecture to override autodetection.
ifndef ARCH

10
src/Makefile.m32
View File

@ -113,14 +113,20 @@ endif
ifeq ($(CURL_AR),)
CURL_AR := $(CROSSPREFIX)ar
endif
ifeq ($(CURL_RC),)
CURL_RC := $(CROSSPREFIX)windres
endif
ifeq ($(CURL_STRIP),)
CURL_STRIP := $(CROSSPREFIX)strip
endif
CC = $(CURL_CC)
CFLAGS = -O3 $(CURL_CFLAG_EXTRAS) -W -Wall
LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE)
AR = $(CURL_AR)
RC = $(CROSSPREFIX)windres
RC = $(CURL_RC)
RCFLAGS = --include-dir=$(PROOT)/include -O coff -DCURL_EMBED_MANIFEST $(CURL_RCFLAG_EXTRAS)
STRIP = $(CROSSPREFIX)strip -g
STRIP = $(CURL_STRIP) -g
# We may need these someday
# PERL = perl