Changeset 540 for trunk/src

Timestamp:

Sep 19, 2006, 7:47:43 AM (19 years ago)

Author:

bird

Message:

HAVE_CYGWIN_SHELL was a bad idea.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (1 diff)
• w32/subproc/sub_proc.c (modified) (3 diffs)

trunk/src/gmake/Makefile.kmk

@@ -30 +30 @@
         CONFIG_WITH_VALUE_LENGTH \
         CONFIG_WITH_COMPARE
-kmk_DEFS.win32 = HAVE_CYGWIN_SHELL
-kmk_DEFS.win64 = HAVE_CYGWIN_SHELL
 
 kmk_SOURCES = \

trunk/src/gmake/w32/subproc/sub_proc.c

@@ -961 +961 @@
         int  cygwin_mode = 0; /* HAVE_CYGWIN_SHELL */
         int have_sh = 0; /* HAVE_CYGWIN_SHELL */
-
+#undef HAVE_CYGWIN_SHELL
 #ifdef HAVE_CYGWIN_SHELL
         have_sh = (shell_name != NULL || strstr(full_exec_path, "sh.exe"));
@@ -1156 +1156 @@
 #endif
 #ifdef KMK
-                        /* 
+                        /*
                          * ash it put off by echo "hello world" ending up as:
                          *  G:/.../kmk_ash.exe -c "echo ""hello world"""
@@ -1162 +1162 @@
                          * (The 'test_shell' goals in Makefile.kmk tests this problem.)
                          */
-                        if (command_line_i[-1] == '\"' && cygwin_mode && have_sh && !argvi[1]) {
+                        if (command_line_i[-1] == '\"' /* && cygwin_mode && have_sh*/ && !argvi[1]) {
                             *(command_line_i++) = ' ';
                         }
-#endif 
+#endif
                         *(command_line_i++) = '\"';
                 }