Changeset 522 for trunk/src

Timestamp:

Sep 16, 2006, 8:04:15 AM (19 years ago)

Author:

bird

Message:

kmk_ash wants batch files on windows or the double quotes will get screwed up.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (1 diff)
• main.c (modified) (1 diff)

trunk/src/gmake/Makefile.kmk

@@ -212 +212 @@
         echo "4"
 
+# shell double and single quoting check.
+test_shell_quoting:
+        $(ECHO_EXT) "double quoted sTrInG" | $(SED_EXT) -e "s/sTrInG/string/g"
+        $(ECHO_EXT) 'single quoted sTrInG' | $(SED_EXT) -e 's/sTrInG/string/g'
+        $(ECHO) "This string should not be printed with double quotes."
+        $(ECHO) 'This string should not be printed with single quotes.'

trunk/src/gmake/main.c

@@ -842 +842 @@
   }
 
+#ifdef KMK
+  /* WORKAROUND:
+    With GNU Make 3.81, this kludge was necessary to get double quotes 
+    working correctly again (worked fine with the 3.81beta1 code). 
+    beta1 was forcing batch_mode_shell I think, so let's enforce that 
+    for the kBuild shell. */
+  if (sh_found && strstr(default_shell, "kmk_ash")) {
+      unixy_shell = 1;
+      batch_mode_shell = 1;
+  } else
+#endif 
   /* naive test */
   if (!unixy_shell && sh_found &&