diff options
Diffstat (limited to 'src/libs/xpcom18a4/Config.kmk')
| -rw-r--r-- | src/libs/xpcom18a4/Config.kmk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk index 5c193e63c44..f9588c9b807 100644 --- a/src/libs/xpcom18a4/Config.kmk +++ b/src/libs/xpcom18a4/Config.kmk @@ -58,10 +58,14 @@ TEMPLATE_XPCOM_CFLAGS.freebsd = -pthread TEMPLATE_XPCOM_CFLAGS.l4 = -nostdinc TEMPLATE_XPCOM_CFLAGS.linux = -pthread -ansi TEMPLATE_XPCOM_CFLAGS.solaris = -fno-omit-frame-pointer # for now anyway. -TEMPLATE_XPCOM_DEFS = MOZILLA_CLIENT=1 NDEBUG=1 _IMPL_NS_COM \ - XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \ - MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\" \ - IN_RING3 +TEMPLATE_XPCOM_DEFS = \ + MOZILLA_CLIENT=1 \ + NDEBUG=1 \ + _IMPL_NS_COM \ + XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \ + MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\" \ + IN_RING3 \ + VBOX_USE_IPRT_IN_XPCOM ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP TEMPLATE_XPCOM_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP endif @@ -190,7 +194,9 @@ TEMPLATE_XPCOMTSTEXE_CFLAGS = $(TEMPLATE_XPCOMEXE_CFLAGS) -Wno-format TEMPLATE_XPCOMBLDPROG = XPCOM Build programs executables TEMPLATE_XPCOMBLDPROG_EXTENDS = VBOXBLDPROG ## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPCOMEXE is expanded when this is being used.) -TEMPLATE_XPCOMBLDPROG_DEFS = $(TEMPLATE_VBOXBLDPROG_DEFS) $(TEMPLATE_XPCOMEXE_DEFS) +TEMPLATE_XPCOMBLDPROG_DEFS = \ + $(TEMPLATE_VBOXBLDPROG_DEFS) \ + $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPCOMEXE_DEFS)) TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBOXBLDPROG_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST)) TEMPLATE_XPCOMBLDPROG_DEFS.x86 = $(TEMPLATE_VBOXBLDPROG_DEFS.x86) $(TEMPLATE_XPCOMEXE_DEFS.x86) TEMPLATE_XPCOMBLDPROG_DEFS.amd64 = $(TEMPLATE_VBOXBLDPROG_DEFS.amd64) $(TEMPLATE_XPCOMEXE_DEFS.amd64) |