=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/engine.c,v retrieving revision 1.53 retrieving revision 1.54 diff -c -r1.53 -r1.54 *** src/usr.bin/make/engine.c 2017/07/09 15:28:00 1.53 --- src/usr.bin/make/engine.c 2017/07/24 12:08:15 1.54 *************** *** 1,4 **** ! /* $OpenBSD: engine.c,v 1.53 2017/07/09 15:28:00 espie Exp $ */ /* * Copyright (c) 2012 Marc Espie. * --- 1,4 ---- ! /* $OpenBSD: engine.c,v 1.54 2017/07/24 12:08:15 espie Exp $ */ /* * Copyright (c) 2012 Marc Espie. * *************** *** 734,740 **** } static bool ! do_run_command(Job *job) { bool silent; /* Don't print command */ bool doExecute; /* Execute the command */ --- 734,740 ---- } static bool ! do_run_command(Job *job, const char *pre) { bool silent; /* Don't print command */ bool doExecute; /* Execute the command */ *************** *** 752,758 **** /* How can we execute a null command ? we warn the user that the * command expanded to nothing (is this the right thing to do?). */ if (*cmd == '\0') { ! Error("%s expands to empty string", cmd); return false; } --- 752,760 ---- /* How can we execute a null command ? we warn the user that the * command expanded to nothing (is this the right thing to do?). */ if (*cmd == '\0') { ! Parse_Error(PARSE_WARNING, ! "'%s' expands to '' while building %s", ! pre, job->node->name); return false; } *************** *** 833,839 **** job->next_cmd = Lst_Adv(job->next_cmd); if (fatal_errors) Punt(NULL); ! started = do_run_command(job); if (started) return false; else --- 835,841 ---- job->next_cmd = Lst_Adv(job->next_cmd); if (fatal_errors) Punt(NULL); ! started = do_run_command(job, command->string); if (started) return false; else