From c88b0849511b970abe9864993c011af89e0daccc Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Wed, 27 Jun 2012 00:51:41 +0100
Subject: Makefile tweaks

Add an all-nojs target to make all the non-js dependent targets;
I envisage the cluster using this for normal runs so that having
a broken v8 library won't stop normal tests working.

Add macosx detection for the choice of v8 library to use.
---
 Makethird | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'Makethird')

diff --git a/Makethird b/Makethird
index 36d83a13..290c612d 100644
--- a/Makethird
+++ b/Makethird
@@ -25,9 +25,16 @@ V8LIB_CHOICE := debug
 endif
 
 # If you are building for 32bit linux use V8_ARCH=ia32
+# MacOSX has a 64bit kernel, but a 32 bit userspace.
+ifeq "$(OS)" "Darwin"
+V8_ARCH ?= ia32
+V8_DIR ?= out-mac
+else
 V8_ARCH ?= x64
+V8_DIR ?= out
+endif
 
-V8LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp
+V8LIBS = -L$(V8_DIR)/$(V8_DIR)/$(V8_ARCH).$(V8LIB_CHOICE)/obj.target/tools/gyp
 
 V8_PRESENT := 1
 else
-- 
cgit v1.2.3