aboutsummaryrefslogtreecommitdiffstats
path: root/distrib
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2010-05-27 11:41:41 -0500
committerJeff Hamilton <jham@android.com>2010-06-03 17:50:25 -0500
commitd0d9734ce225ca6421caf1decfc12dcc4cb2a58c (patch)
tree6dd65f6466f0e91b6ff5c8a21ade50aef72d5fcf /distrib
parent34f2974ce7ec7c71beb47b5daf9089d5c8c40c79 (diff)
downloadexternal_qemu-d0d9734ce225ca6421caf1decfc12dcc4cb2a58c.zip
external_qemu-d0d9734ce225ca6421caf1decfc12dcc4cb2a58c.tar.gz
external_qemu-d0d9734ce225ca6421caf1decfc12dcc4cb2a58c.tar.bz2
Make the emulator build on Snow Leopard.
Force the minimum platform version to Leopard. Change-Id: Ibfff1ad611e1f262b81a324a16a3a28f80ae9a17
Diffstat (limited to 'distrib')
-rw-r--r--distrib/zlib-1.2.3/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/zlib-1.2.3/Makefile b/distrib/zlib-1.2.3/Makefile
index 9cf80c9..73af0c3 100644
--- a/distrib/zlib-1.2.3/Makefile
+++ b/distrib/zlib-1.2.3/Makefile
@@ -1,13 +1,13 @@
# Makefile used to compile zlib statically
#
ZLIB_LIB := $(SRC_PATH)/libz.a
-ZLIB_CFLAGS := -I$(ZLIB_DIR)
+ZLIB_CFLAGS := -I$(ZLIB_DIR) $(MY_CFLAGS)
include $(ZLIB_DIR)/sources.make
ZLIB_OBJS := $(ZLIB_SOURCES:%.c=%.o)
$(ZLIB_LIB): $(ZLIB_OBJS)
- ar ru $(ZLIB_LIB) $(ZLIB_OBJS)
+ ar ru $(ZLIB_LIB) $(MY_LDLIBS) $(ZLIB_OBJS)
$(ZLIB_OBJS): CFLAGS += $(ZLIB_CFLAGS)