blob: 63c2e4ddde938a995c2b9a34f6f9bc118682d582 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From dcb863e18f619137c3fe040f632adccb13d07a09 Mon Sep 17 00:00:00 2001
From: Levente Polyak <levente@leventepolyak.net>
Date: Wed, 23 May 2018 11:13:26 +0200
Subject: [PATCH 2/3] libc: respect zip/deps.mk for zlib/libzip (#10163)
Additionally respect standard caller {C,CPP,LD}FLAGS plus the
deps.mk relaed LINK
---
libr/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libr/Makefile b/libr/Makefile
index 0b39b48c0..0d0257708 100644
--- a/libr/Makefile
+++ b/libr/Makefile
@@ -3,6 +3,7 @@ include config.mk
include ../config-user.mk
include ../mk/platform.mk
include ../mk/${COMPILER}.mk
+include ${SHLR}/zip/deps.mk
DESTDIR:=$(DESTDIR)
PREFIX?=${PWD}/../prefix
@@ -91,10 +92,9 @@ E+=../shlr/capstone/libcapstone.${EXT_AR}
endif
libr.${EXT_SO}: .libr
- $(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO} \
+ $(CC) -fvisibility=hidden $(MLFLAGS) ${LINK} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -dynamiclib -o libr.${EXT_SO} \
.libr/*.o \
../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
- ../shlr/zip/librz.${EXT_AR} \
../shlr/libr_shlr.${EXT_AR} $(E)
else
--
2.17.1
|