aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/zlib
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-10-16 14:32:37 +0200
committerJohn Högberg <[email protected]>2018-10-16 14:32:37 +0200
commitf6d91fb83484023182fd866bc75c7733c41a30a8 (patch)
treeec897e74c09f1788eba4317f529b359c9d080e80 /erts/emulator/zlib
parent4636269001b110548f4a8f35f48eefe7f9bed86f (diff)
parentd6d37f2424d11ad322beb3d155f18f63c3c845eb (diff)
downloadotp-f6d91fb83484023182fd866bc75c7733c41a30a8.tar.gz
otp-f6d91fb83484023182fd866bc75c7733c41a30a8.tar.bz2
otp-f6d91fb83484023182fd866bc75c7733c41a30a8.zip
Merge branch 'fhunleth/fix-muslc-compiler-error' into john/erts/update-zlib/OTP-15351/ERL-749
* fhunleth/fix-muslc-compiler-error: Allow undefined macros when building zlib
Diffstat (limited to 'erts/emulator/zlib')
-rw-r--r--erts/emulator/zlib/zlib.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/zlib/zlib.mk b/erts/emulator/zlib/zlib.mk
index dcf5d3f592..b51b4ec8d6 100644
--- a/erts/emulator/zlib/zlib.mk
+++ b/erts/emulator/zlib/zlib.mk
@@ -62,6 +62,9 @@ ZLIB_CFLAGS = $(subst -O2, -O3, $(CONFIGURE_CFLAGS) $(DEFS) $(THR_DEFS))
endif # debug
endif # gcov
+# Don't fail if _LFS64_LARGEFILE is undefined
+ZLIB_CFLAGS := $(filter-out -Werror=undef,$(ZLIB_CFLAGS))
+
ifeq ($(TARGET), win32)
$(ZLIB_LIBRARY): $(ZLIB_OBJS)
$(V_AR) -out:$@ $(ZLIB_OBJS)