Changeset 2815 in kBuild for trunk/src/kmk/kbuild.c

Timestamp:

Aug 14, 2016 12:03:44 PM (8 years ago)

Author:

bird

Message:

func_kbuild_source_one: Use different variable block compile job dependency file inclusion: NO_COMPILE_CMDS_DEPS -> NO_COMPILE_DEPS

File:

• trunk/src/kmk/kbuild.c (modified) (2 diffs)

trunk/src/kmk/kbuild.c

@@ -1962 +1962 @@
 func_kbuild_source_one(char *o, char **argv, const char *pszFuncName)
 {
-    static int s_fNoCompileCmdsDepsDefined = -1;
+    static int s_fNoCompileDepsDefined = -1;
     struct variable *pTarget    = kbuild_get_variable_n(ST("target"));
     struct variable *pSource    = kbuild_get_variable_n(ST("source"));
@@ -2053 +2053 @@
     /*
     # dependencies
-    ifndef NO_COMPILE_CMDS_DEPS
+    ifndef NO_COMPILE_DEPS
     _DEPFILES_INCLUDED += $(dep)
     $(if $(wildcard $(dep)),$(eval include $(dep)))
     endif
      */
-    if (s_fNoCompileCmdsDepsDefined == -1)
-        s_fNoCompileCmdsDepsDefined = kbuild_lookup_variable_n(ST("NO_COMPILE_CMDS_DEPS")) != NULL;
-    if (!s_fNoCompileCmdsDepsDefined)
+    if (s_fNoCompileDepsDefined == -1)
+        s_fNoCompileDepsDefined = kbuild_lookup_variable_n(ST("NO_COMPILE_DEPS")) != NULL;
+    if (!s_fNoCompileDepsDefined)
     {
         pVar = kbuild_query_recursive_variable_n("_DEPFILES_INCLUDED", sizeof("_DEPFILES_INCLUDED") - 1);