Skip to content

Commit 0c38e79

Browse files
authored
Try to fix libunwind source build
1 parent 950a87f commit 0c38e79

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

deps/unwind.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(SRCDIR)/unwind.version
33
include $(SRCDIR)/llvmunwind.version
44

55
ifneq ($(USE_BINARYBUILDER_LIBUNWIND),1)
6-
LIBUNWIND_CFLAGS := -U_FORTIFY_SOURCE $(fPIC) -lz $(SANITIZE_OPTS)
6+
LIBUNWIND_CFLAGS := -U_FORTIFY_SOURCE $(fPIC) $(SANITIZE_OPTS)
77
LIBUNWIND_CPPFLAGS :=
88

99
ifeq ($(USE_SYSTEM_ZLIB),0)
@@ -48,7 +48,7 @@ $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-disable-initial-exec-tls.patch-app
4848
$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured: $(SRCCACHE)/libunwind-$(UNWIND_VER)/source-extracted $(SRCCACHE)/libunwind-$(UNWIND_VER)/libunwind-disable-initial-exec-tls.patch-applied
4949
mkdir -p $(dir $@)
5050
cd $(dir $@) && \
51-
$(dir $<)/configure $(CONFIGURE_COMMON) CPPFLAGS="$(CPPFLAGS) $(LIBUNWIND_CPPFLAGS)" CFLAGS="$(CFLAGS) $(LIBUNWIND_CFLAGS)" --enable-shared --disable-minidebuginfo --disable-tests --enable-zlibdebuginfo --disable-conservative-checks --enable-per-thread-cache
51+
$(dir $<)/configure $(CONFIGURE_COMMON) CPPFLAGS="$(CPPFLAGS) $(LIBUNWIND_CPPFLAGS)" CFLAGS="$(CFLAGS) $(LIBUNWIND_CFLAGS)" LDFLAGS=$(LDFLAGS) --enable-shared --disable-minidebuginfo --disable-tests --enable-zlibdebuginfo --disable-conservative-checks --enable-per-thread-cache
5252
echo 1 > $@
5353

5454
$(BUILDDIR)/libunwind-$(UNWIND_VER)/build-compiled: $(BUILDDIR)/libunwind-$(UNWIND_VER)/build-configured

0 commit comments

Comments
 (0)