Changeset 41534 in vbox

Timestamp:

Jun 1, 2012 10:09:26 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78297

Message:

Config.kmk: Quoted strings with dots and wasm doesn't go well along.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -1432 +1432 @@
  DEFS += VBOX_WITH_HARDENING
 endif
-ifdef VBOX_PATH_APP_PRIVATE
- DEFS += RTPATH_APP_PRIVATE=\"$(VBOX_PATH_APP_PRIVATE)\"
-endif
-ifdef VBOX_PATH_APP_PRIVATE_ARCH
- DEFS += RTPATH_APP_PRIVATE_ARCH=\"$(VBOX_PATH_APP_PRIVATE_ARCH)\"
-endif
-ifdef VBOX_PATH_APP_PRIVATE_ARCH_TOP
- DEFS += RTPATH_APP_PRIVATE_ARCH_TOP=\"$(VBOX_PATH_APP_PRIVATE_ARCH_TOP)\"
-endif
-ifdef VBOX_PATH_SHARED_LIBS
- DEFS += RTPATH_SHARED_LIBS=\"$(VBOX_PATH_SHARED_LIBS)\"
-endif
-ifdef VBOX_PATH_APP_DOCS
- DEFS += RTPATH_APP_DOCS=\"$(VBOX_PATH_APP_DOCS)\"
-endif
 if defined(VBOX_WITH_STRICT_LOCKS) && ($(KBUILD_TYPE) == "debug" || $(KBUILD_TYPE) == "strict")
  DEFS += RT_LOCK_STRICT RT_LOCK_STRICT_ORDER
@@ -1454 +1439 @@
 endif
 
+# Quoted strings should not be passed to the assemblers since they might not
+# subscribe to C preprocessing semantics.
+ifdef VBOX_PATH_APP_PRIVATE
+ CDEFS += RTPATH_APP_PRIVATE=\"$(VBOX_PATH_APP_PRIVATE)\"
+endif
+ifdef VBOX_PATH_APP_PRIVATE_ARCH
+ CDEFS += RTPATH_APP_PRIVATE_ARCH=\"$(VBOX_PATH_APP_PRIVATE_ARCH)\"
+endif
+ifdef VBOX_PATH_APP_PRIVATE_ARCH_TOP
+ CDEFS += RTPATH_APP_PRIVATE_ARCH_TOP=\"$(VBOX_PATH_APP_PRIVATE_ARCH_TOP)\"
+endif
+ifdef VBOX_PATH_SHARED_LIBS
+ CDEFS += RTPATH_SHARED_LIBS=\"$(VBOX_PATH_SHARED_LIBS)\"
+endif
+ifdef VBOX_PATH_APP_DOCS
+ CDEFS += RTPATH_APP_DOCS=\"$(VBOX_PATH_APP_DOCS)\"
+endif
+CXXDEFS  += $(CDEFS)
+OBJCDEFS += $(CDEFS)
+
 USES += dtrace
+
 
 #