commit f324690a7d9a810e3c1bd93aec7ae982de2b227f
author Nick Wellnhofer <wellnhofer@aevum.de> Wed Jun 01 21:50:25 2016 +0200
committer Nick Wellnhofer <wellnhofer@aevum.de> Thu Jun 02 00:04:27 2016 +0200
tree 81b68ad8f329b0c679ca0f05ed408e5d444d7dbd
parent c5387af383d317dcd887f9e07769c589039e099c

Check whether the make command matches the OS shell

src/Charmonizer/Core/Make.c

diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c
index 1c1d728..8e8699b 100644
--- a/src/Charmonizer/Core/Make.c
+++ b/src/Charmonizer/Core/Make.c
@@ -80,6 +80,8 @@
 
 void
 chaz_Make_init(const char *make_command) {
+    chaz_Make.shell_type = chaz_OS_shell_type();
+
     if (make_command) {
         if (!chaz_Make_detect(make_command, NULL)) {
             chaz_Util_warn("Make utility '%s' doesn't appear to work");
@@ -95,11 +97,6 @@
             printf("Detected make utility '%s'\n", chaz_Make.make_command);
         }
     }
-
-    if (chaz_Make.shell_type == 0) {
-        // Assume POSIX.
-        chaz_Make.shell_type = CHAZ_OS_POSIX;
-    }
 }
 
 void
@@ -149,12 +146,14 @@
         size_t len;
         char *content = chaz_Util_slurp_file("_charm_foo", &len);
         if (NULL != strstr(content, "foo\\bar")) {
-            chaz_Make.shell_type = CHAZ_OS_CMD_EXE;
-            succeeded = 1;
+            if (chaz_Make.shell_type == CHAZ_OS_CMD_EXE) {
+                succeeded = 1;
+            }
         }
         else if (NULL != strstr(content, "foo^bar")) {
-            chaz_Make.shell_type = CHAZ_OS_POSIX;
-            succeeded = 1;
+            if (chaz_Make.shell_type == CHAZ_OS_POSIX) {
+                succeeded = 1;
+            }
         }
         free(content);
     }