Date: Fri, 12 Nov 2010 22:10:19 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r215208 - projects/jbuild/usr.bin/make Message-ID: <201011122210.oACMAJj7025144@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Fri Nov 12 22:10:19 2010 New Revision: 215208 URL: http://svn.freebsd.org/changeset/base/215208 Log: * jbuild(1) does not rely on SQL libs. * #ifdef out the use of INCMK - which is irrelevant since the *.dirdep file was introduced. Obtained from: Juniper Networks Modified: projects/jbuild/usr.bin/make/job.c Modified: projects/jbuild/usr.bin/make/job.c ============================================================================== --- projects/jbuild/usr.bin/make/job.c Fri Nov 12 22:03:02 2010 (r215207) +++ projects/jbuild/usr.bin/make/job.c Fri Nov 12 22:10:19 2010 (r215208) @@ -564,10 +564,14 @@ meta_exit(void) * If there is no include makefile list variable defined, then * we can't update dependencies. */ +#ifdef NEED_INCMK + /* This is OBE by the .dirdep file. */ if ((p_incmk = Var_Value("INCMK", VAR_GLOBAL)) != NULL) { /* Initialise the include makefile name list. */ jdirdep_incmk(Var_Value("INCMK", VAR_GLOBAL)); - +#else + { +#endif p_machine = Var_Value("MACHINE", VAR_GLOBAL); p_machine_arch = Var_Value("MACHINE_ARCH", VAR_GLOBAL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011122210.oACMAJj7025144>