Repository: lucy-charmonizer Updated Branches: refs/heads/master 0b6b2a3b7 -> 9cf02f2a2
Fix make shell detection Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/746debae Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/746debae Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/746debae Branch: refs/heads/master Commit: 746debae3695e4cd589397c60cfff3c87ecba49e Parents: 0b6b2a3 Author: Nick Wellnhofer <[email protected]> Authored: Sat May 21 18:10:46 2016 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Sat May 21 18:10:46 2016 +0200 ---------------------------------------------------------------------- src/Charmonizer/Core/Make.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/746debae/src/Charmonizer/Core/Make.c ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c index 0ddf60c..898ed49 100644 --- a/src/Charmonizer/Core/Make.c +++ b/src/Charmonizer/Core/Make.c @@ -122,7 +122,7 @@ chaz_Make_detect(const char *make1, ...) { va_list args; const char *candidate; int found = 0; - const char makefile_content[] = "foo:\n\t@echo \\^foo!\n"; + const char makefile_content[] = "foo:\n\techo foo\\^bar\n"; chaz_Util_write_file("_charm_Makefile", makefile_content); /* Audition candidates. */ @@ -148,11 +148,11 @@ chaz_Make_audition(const char *make) { if (chaz_Util_can_open_file("_charm_foo")) { size_t len; char *content = chaz_Util_slurp_file("_charm_foo", &len); - if (strncmp(content, "\\foo!", 5) == 0) { + if (NULL != strstr(content, "foo\\bar")) { chaz_Make.shell_type = CHAZ_OS_CMD_EXE; succeeded = 1; } - else if (strncmp(content, "^foo!", 5) == 0) { + else if (NULL != strstr(content, "foo^bar")) { chaz_Make.shell_type = CHAZ_OS_POSIX; succeeded = 1; }
