mirror of
https://github.com/mirror/make.git
synced 2025-03-28 21:11:03 +08:00
Sat Jun 22 14:56:05 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* file.c (file_hash_enter): Allow renaming :: to : when latter is non-target, or : to :: when former is non-target.
This commit is contained in:
parent
bdc49369eb
commit
3024918fcd
9
file.c
9
file.c
@ -1,5 +1,5 @@
|
|||||||
/* Target file hash table management for GNU Make.
|
/* Target file hash table management for GNU Make.
|
||||||
Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
|
Copyright (C) 1988,89,90,91,92,93,94,95,96 Free Software Foundation, Inc.
|
||||||
This file is part of GNU Make.
|
This file is part of GNU Make.
|
||||||
|
|
||||||
GNU Make is free software; you can redistribute it and/or modify
|
GNU Make is free software; you can redistribute it and/or modify
|
||||||
@ -295,12 +295,17 @@ in favor of those for `%s'.",
|
|||||||
|
|
||||||
merge_variable_set_lists (&oldfile->variables, file->variables);
|
merge_variable_set_lists (&oldfile->variables, file->variables);
|
||||||
|
|
||||||
if (oldfile->double_colon && !file->double_colon)
|
if (oldfile->double_colon && file->is_target && !file->double_colon)
|
||||||
fatal ("can't rename single-colon `%s' to double-colon `%s'",
|
fatal ("can't rename single-colon `%s' to double-colon `%s'",
|
||||||
oldname, name);
|
oldname, name);
|
||||||
if (!oldfile->double_colon && file->double_colon)
|
if (!oldfile->double_colon && file->double_colon)
|
||||||
|
{
|
||||||
|
if (oldfile->is_target)
|
||||||
fatal ("can't rename double-colon `%s' to single-colon `%s'",
|
fatal ("can't rename double-colon `%s' to single-colon `%s'",
|
||||||
oldname, name);
|
oldname, name);
|
||||||
|
else
|
||||||
|
oldfile->double_colon = file->double_colon;
|
||||||
|
}
|
||||||
|
|
||||||
if (file->last_mtime > oldfile->last_mtime)
|
if (file->last_mtime > oldfile->last_mtime)
|
||||||
/* %%% Kludge so -W wins on a file that gets vpathized. */
|
/* %%% Kludge so -W wins on a file that gets vpathized. */
|
||||||
|
Loading…
Reference in New Issue
Block a user