diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/nspr/prcpucfg.h | 4 | ||||
| -rw-r--r-- | config/rules.mk | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/config/external/nspr/prcpucfg.h b/config/external/nspr/prcpucfg.h index 8f455b509c..8769abeeb8 100644 --- a/config/external/nspr/prcpucfg.h +++ b/config/external/nspr/prcpucfg.h @@ -10,7 +10,9 @@ * Need to support conditionals that are defined in both the top-level build * system as well as NSS' build system for now. */ -#if defined(XP_WIN) || defined(_WINDOWS) +#if defined(XP_DARWIN) || defined(DARWIN) +#include "md/_darwin.cfg" +#elif defined(XP_WIN) || defined(_WINDOWS) #include "md/_win95.cfg" #elif defined(__FreeBSD__) #include "md/_freebsd.cfg" diff --git a/config/rules.mk b/config/rules.mk index 840e266ba5..cb3e307ae2 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1,4 +1,5 @@ # -*- makefile -*- +# vim:set ts=8 sw=8 sts=8 noet: # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, @@ -750,6 +751,7 @@ $(HOST_LIBRARY): $(HOST_OBJS) Makefile $(EXPAND_LIBS_EXEC) --extract -- $(HOST_AR) $(HOST_AR_FLAGS) $(HOST_OBJS) ifdef HAVE_DTRACE +ifndef XP_MACOSX ifdef DTRACE_PROBE_OBJ ifndef DTRACE_LIB_DEPENDENT NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS)) @@ -758,6 +760,7 @@ $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS) endif endif endif +endif # On Darwin (Mac OS X), dwarf2 debugging uses debug info left in .o files, # so instead of deleting .o files after repacking them into a dylib, we make @@ -770,7 +773,9 @@ ifndef INCREMENTAL_LINKER $(RM) $@ endif ifdef DTRACE_LIB_DEPENDENT +ifndef XP_MACOSX dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) +endif $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) @$(RM) $(DTRACE_PROBE_OBJ) else # ! DTRACE_LIB_DEPENDENT |