Changeset 47890 in vbox

Timestamp:

Aug 20, 2013 11:16:30 AM (11 years ago)

Author:

vboxsync

Message:

libs/xpcom: try to fix xpcom component loading issues with hardened builds for code which doesn't use the glue

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2013 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -757 +757 @@
 VBox-xpcom-io_INSTTYPE = none
 VBox-xpcom-io_DEFS = _IMPL_NS_COM MOZ_USER_DIR=\".mozilla\"
+if defined(VBOX_WITH_HARDENING) && defined(VBOX_PATH_APP_PRIVATE_ARCH)
+ VBox-xpcom-io_DEFS += MOZ_DEFAULT_VBOX_XPCOM_HOME=$(VBOX_PATH_APP_PRIVATE_ARCH)
+endif
 VBox-xpcom-io_INCS.darwin = \
         xpcom/MoreFiles
@@ -919 +922 @@
 VBoxXPCOMGlue_TEMPLATE = XPCOM
 VBoxXPCOMGlue_DEFS     = XPCOM_GLUE
+if defined(VBOX_WITH_HARDENING) && defined(VBOX_PATH_APP_PRIVATE_ARCH)
+ VBoxXPCOMGlue_DEFS    += MOZ_DEFAULT_VBOX_XPCOM_HOME=foo
+elsif
 VBoxXPCOMGlue_SOURCES  = $(VBoxXPCOMGlue_COMMON_SOURCES) \
                          xpcom/glue/standalone/nsXPCOMGlue.cpp \