From 9c496f6461cb4538bc016680315b55fe2d2bc2d3 Mon Sep 17 00:00:00 2001 From: "joshmoz%gmail.com" Date: Wed, 1 Jun 2005 18:48:04 +0000 Subject: [PATCH] more Mac OS X 10.4 "Tiger" build stuff. Patch my Mark Mentovai. r=josh r=pinkerton r=cls sr=bryner a=brendan git-svn-id: svn://10.0.0.236/trunk@173953 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/typelib/xpidl/Makefile.in | 3 +++ mozilla/xpfe/bootstrap/appleevents/Makefile.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/xpcom/typelib/xpidl/Makefile.in b/mozilla/xpcom/typelib/xpidl/Makefile.in index ae228ef0e8c..3ce6730c889 100644 --- a/mozilla/xpcom/typelib/xpidl/Makefile.in +++ b/mozilla/xpcom/typelib/xpidl/Makefile.in @@ -80,7 +80,10 @@ endif endif ifdef MACOS_SDK_DIR +# xpidl is for the build host, pull out the cross-compilation stuff NEXT_ROOT= +OS_CFLAGS := $(shell echo $(OS_CFLAGS)|sed -E -e "s%((-I|-isystem )$(MACOS_SDK_DIR)/usr/(include|lib/gcc)[^ ]*)|-F$(MACOS_SDK_DIR)(/System)?/Library/Frameworks[^ ]*|-nostdinc[^ ]*%%g") +OS_CFLAGS := $(patsubst -I$(MACOS_SDK_DIR)%,-I%,$(OS_CFLAGS)) OS_LIBS := $(patsubst -L$(MACOS_SDK_DIR)/usr/lib%,,$(OS_LIBS)) endif diff --git a/mozilla/xpfe/bootstrap/appleevents/Makefile.in b/mozilla/xpfe/bootstrap/appleevents/Makefile.in index 1d7ae0c9754..4e6ea656eb0 100644 --- a/mozilla/xpfe/bootstrap/appleevents/Makefile.in +++ b/mozilla/xpfe/bootstrap/appleevents/Makefile.in @@ -109,7 +109,7 @@ include $(topsrcdir)/config/rules.mk # convert AppleScript dictionary .sdef file into .r format, and thence to .rsrc -SDP_TOOL = /Developer/Tools/sdp +SDP_TOOL = $(SDP) REZ_TOOL = /Developer/Tools/Rez SDEF_SRC = $(srcdir)/mozilla.sdef RES_DEST = mozillaSuite.r