Changeset 3572 in kBuild for trunk

Timestamp:

Oct 24, 2022 8:36:35 AM (3 years ago)

Author:

bird

Message:

Config.kmk,src/kmk/Makefile.kmk: Added temporary kludge for inconsistent quoting and escaping of DEFS properties among the compiler tools.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/kmk/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -124 +124 @@
  TOOL_FLEX_LEX = gflex
 endif
+# Not all compiler tools currently do the same quoting of DEFS, so here's a
+# temporary workaround.
+ifn1of ($(KBUILD_TARGET), win)
+ TMP_QUOTE_SLASH :=
+else
+ TMP_QUOTE_SLASH := \$(NO_SUCH_VARIABLE)
+endif
 
 #
@@ -183 +190 @@
 
 DEFS += \
-        KBUILD_PATH=\"/$(patsubst %/,%,$(MY_INST_DATA))\" \
-        KBUILD_BIN_PATH=\"/$(patsubst %/,%,$(MY_INST_BIN))\"
+        KBUILD_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_DATA))$(TMP_QUOTE_SLASH)" \
+        KBUILD_BIN_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_BIN))$(TMP_QUOTE_SLASH)"
 endif
 

trunk/src/kmk/Makefile.kmk

@@ -39 +39 @@
         $(TEMPLATE_BIN_DEFS) \
         KBUILD_SVN_REV=$(KBUILD_SVN_REV) \
-        KBUILD_TYPE=\"$(KBUILD_TYPE)\"
+        KBUILD_TYPE=$(TMP_QUOTE_SLASH)"$(KBUILD_TYPE)$(TMP_QUOTE_SLASH)"
 TEMPLATE_BIN-KMK_DEPS = \
         $(kmk_0_OUTDIR)/config.h \
@@ -235 +235 @@
         CONFIG_WITH_MEMORY_OPTIMIZATIONS \
         \
-        KBUILD_HOST=\"$(KBUILD_TARGET)\" \
-        KBUILD_HOST_ARCH=\"$(KBUILD_TARGET_ARCH)\" \
-        KBUILD_HOST_CPU=\"$(KBUILD_TARGET_CPU)\"
+        KBUILD_HOST=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET)$(TMP_QUOTE_SLASH)" \
+        KBUILD_HOST_ARCH=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_ARCH)$(TMP_QUOTE_SLASH)" \
+        KBUILD_HOST_CPU=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_CPU)$(TMP_QUOTE_SLASH)"
 # kmk_DEFS += CONFIG_WITH_COMPILER  # experimental, doesn't work 101% right it seems.
 kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS