diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-08-14 04:46:20 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-08-14 04:46:20 +0000 |
| commit | c852b1e121e478ef1f6d87f3d42c8d9c2f479d94 (patch) | |
| tree | 5bb06cd9a40c1102fa0985f99ff04c3c9c35beb6 /usr.bin/make | |
| parent | 9e0af5b4e34026a6a2f8e78e634573fd80be2307 (diff) | |
| download | FreeBSD-src-c852b1e121e478ef1f6d87f3d42c8d9c2f479d94.zip FreeBSD-src-c852b1e121e478ef1f6d87f3d42c8d9c2f479d94.tar.gz | |
Fix PR bin/4291: /usr/bin/make - inconsistent -j<n> flag parsing.
Submitted by: N.Dudorov <nnd@itfs.nsk.su>
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index dfe0c43..92b3de9d 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -47,7 +47,7 @@ static const char copyright[] = static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: main.c,v 1.18 1997/07/24 06:58:06 charnier Exp $"; #endif /* not lint */ /*- @@ -315,13 +315,6 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) { } } - /* - * Be compatible if user did not specify -j and did not explicitly - * turned compatibility on - */ - if (!compatMake && !forceJobs) - compatMake = TRUE; - oldVars = TRUE; /* @@ -344,6 +337,13 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) { } (void)Lst_AtEnd(create, (ClientData)estrdup(*argv)); } + + /* + * Be compatible if user did not specify -j and did not explicitly + * turned compatibility on + */ + if (!compatMake && !forceJobs) + compatMake = TRUE; } /*- |
