1 --- xpcom/typelib/xpidl/Makefile.in 2009-06-27 21:34:20.000000000 +0200
2 +++ xpcom/typelib/xpidl/Makefile.in 2009-06-27 21:34:20.000000000 +0200
7 -ifeq ($(OS_ARCH),Darwin)
8 -# The only reason to not always strip the SDK out is that the libraries
9 -# in / on ppc currently aren't fat, preventing the target xpidl from linking
10 -# on a ppc->x86 build. The SDK, presumably 10.4u, must be included in that
11 -# case in order to successfully link. Because the target xpidl isn't
12 -# currently built in a cross compile, though, this point is moot for the
16 -# When doing a native build, don't build xpidl against the SDK. libIDL
17 -# was most likely configured for the system headers, and bringing in the
18 -# SDK's headers instead will cause problems.
24 -# Don't build xpidl for the target. This is not intended to be a permanent
25 -# solution. It's necessary because it is presently difficult to build
26 -# xpidl's prerequisites (libIDL and glib) as fat and suitable for a cross.
27 -# This will be fixed. -mm
30 -# Since only host_xpidl will be built for now, always strip out the SDK
34 -# When fat xpidl prerequisites are available, the PROGRAM= and _STRIP_SDK=1
35 -# above are expected to disappear, and be replaced with the following
38 -# ifeq (86_powerpc,$(findstring 86,$(host_cpu))_$(TARGET_CPU))
39 -# # When cross-compiling from x86 to ppc, an old (10.2-ish) SDK might be in
40 -# # use, and libIDL will have been configured for new (10.4-ish) headers.
44 -endif # CROSS_COMPILE
46 -ifneq (,$(_STRIP_SDK)$(MACOS_SDK_DIR))
47 -# libIDL is configured for the system's headers, with no SDK involved.
48 -# There may be header conflicts if the SDK used for the Mozilla build
49 -# is used here. There are very few specific cases where the SDK needs to
50 -# remain set to build xpidl.
52 -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[^ ]*|-isysroot $(MACOS_SDK_DIR)%%g")
53 -OS_CFLAGS := $(patsubst -I$(MACOS_SDK_DIR)%,-I%,$(OS_CFLAGS))
54 -OS_LIBS := $(patsubst -L$(MACOS_SDK_DIR)/usr/lib%,,$(OS_LIBS))
55 -LDFLAGS := $(shell echo $(LDFLAGS)|sed -E -e "s%-Wl,-syslibroot,$(MACOS_SDK_DIR)%%g")
60 include $(topsrcdir)/config/rules.mk
62 CFLAGS += $(LIBIDL_CFLAGS)