From 71f832e5e6d2dca92930be31bfab8c9d53b2bb3a Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sun, 27 Dec 2009 00:54:06 +0000 Subject: [PATCH] Scary hack to use the wrong APR on Mac OSX. --- Darwin.mk | 1 + makefile | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Darwin.mk b/Darwin.mk index 88a92dc..c95a594 100644 --- a/Darwin.mk +++ b/Darwin.mk @@ -8,6 +8,7 @@ library += -framework JavaScriptCore library += -framework WebKit library += -liconv flags += -I/usr/include/ffi +apr_config := /usr/bin/apr-1-config ifeq ($(uname_p),i386) flags += -m32 diff --git a/makefile b/makefile index c359b58..bebb995 100644 --- a/makefile +++ b/makefile @@ -38,9 +38,9 @@ ldid := true entitle := $(ldid) lib := lib dll := so -apr := $(shell apr-1-config --link-ld) -library := $(apr) -console := $(apr) -lreadline +apr_config := apr-1-config +library := +console := -lreadline depends := restart ?= $(MAKE) @@ -62,9 +62,13 @@ endif endif endif +apr := $(shell $(apr_config) --link-ld) +library += $(apr) +console += $(apr) + flags += -Wall -Werror -Wno-parentheses #-Wno-unused flags += -fno-common -flags += -I. -Iinclude -I$(shell apr-1-config --includedir) +flags += -I. -Iinclude -I$(shell $(apr_config) --includedir) all += $(lib)cycript.$(dll) -- 2.49.0