From d0d9734ce225ca6421caf1decfc12dcc4cb2a58c Mon Sep 17 00:00:00 2001
From: Jeff Hamilton <jham@android.com>
Date: Thu, 27 May 2010 11:41:41 -0500
Subject: Make the emulator build on Snow Leopard.

Force the minimum platform version to Leopard.

Change-Id: Ibfff1ad611e1f262b81a324a16a3a28f80ae9a17
---
 distrib/zlib-1.2.3/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'distrib')

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)
 
-- 
cgit v1.1