cuberite/libdeflate
1
0
Fork 0
mirror of https://github.com/cuberite/libdeflate.git synced 2025-09-10 04:41:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: set $(AR) more reliably when building with MinGW

Browse Source
This commit is contained in:
Eric Biggers 2017-04-30 20:45:23 -07:00
parent 671e2bb5b5
commit 1f8090cda1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -40,11 +40,6 @@ HARD_LINKS := 1
# Compiling for Windows with MinGW? # Compiling for Windows with MinGW?
ifneq ($(findstring -mingw,$(shell $(CC) -dumpmachine 2>/dev/null)),) ifneq ($(findstring -mingw,$(shell $(CC) -dumpmachine 2>/dev/null)),)
ifeq ($(AR),ar)
ifneq ($(findstring -mingw,$(CC)),)
AR := $(patsubst %-gcc,%-ar,$(CC))
endif
endif
STATIC_LIB_SUFFIX := .lib STATIC_LIB_SUFFIX := .lib
SHARED_LIB_SUFFIX := .dll SHARED_LIB_SUFFIX := .dll
SHARED_LIB_CFLAGS := SHARED_LIB_CFLAGS :=
@ -52,6 +47,15 @@ ifneq ($(findstring -mingw,$(shell $(CC) -dumpmachine 2>/dev/null)),)
PROG_CFLAGS := -static -municode PROG_CFLAGS := -static -municode
HARD_LINKS := HARD_LINKS :=
override CFLAGS := $(CFLAGS) $(call cc-option,-Wno-pedantic-ms-format) override CFLAGS := $(CFLAGS) $(call cc-option,-Wno-pedantic-ms-format)
# If AR was not already overridden, then derive it from $(CC).
# Note that CC may take different forms, e.g. "cc", "gcc",
# "x86_64-w64-mingw32-gcc", or "x86_64-w64-mingw32-gcc-6.3.1".
# On Windows it may also have a .exe extension.
ifeq ($(AR),ar)
AR := $(shell echo $(CC) | \
sed -E 's/g?cc(-?[0-9]+(\.[0-9]+)*)?(\.exe)?$$/ar\3/')
endif
endif endif
############################################################################## ##############################################################################