diff options
| author | harti <harti@FreeBSD.org> | 2005-03-31 11:35:56 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2005-03-31 11:35:56 +0000 |
| commit | 800d083cdf4d1bf9984ca8b200a2bfbe9313ca55 (patch) | |
| tree | 00483b8a6fa6456801e4dbcabddb39b1a6cfb3d8 /usr.bin/make/arch.h | |
| parent | bdea8226c76f65a9faa907ff77ecec223db5e6f7 (diff) | |
| download | FreeBSD-src-800d083cdf4d1bf9984ca8b200a2bfbe9313ca55.zip FreeBSD-src-800d083cdf4d1bf9984ca8b200a2bfbe9313ca55.tar.gz | |
Almost complete rewrite of the archive code (except for the Makefile parsing
part). Archive handling was broken at least since the move from BSD ar/ranlib
to GNU binutils because of the different archive format. This rewrite fixes
this by making make to carry around the defines for all formats (it supports)
so it can support all of them independent of the actually used one. The
supported formats are: traditional BSD (this seems to come from V7 at least,
short names only and __.SYMDEF), BSD4.4 (long names with #1/ and __.SYMDEF)
and SysV (extra name table and //). The only format not supported are broken
traditional archives where the member names are truncated to 15 characters.
Errors in the archive are not ignored anymore, but cause make to stop with
an error message. The command line option -A causes these errors to become
non-fatal. This is almost compatible with previous usage except for the
error message printed in any case.
Use a type-safe intrusive list for the archive cache.
Reviewed by: Max Okumoto <okumoto@ucsd.edu> (without new error handling)
Diffstat (limited to 'usr.bin/make/arch.h')
| -rw-r--r-- | usr.bin/make/arch.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/make/arch.h b/usr.bin/make/arch.h index d3f4ba9..5b2542f 100644 --- a/usr.bin/make/arch.h +++ b/usr.bin/make/arch.h @@ -47,6 +47,9 @@ struct GNode; struct Lst; struct Path; +/* archive errors are fatal */ +extern Boolean arch_fatal; + ReturnStatus Arch_ParseArchive(char **, struct Lst *, struct GNode *); void Arch_Touch(struct GNode *); void Arch_TouchLib(struct GNode *); @@ -54,6 +57,5 @@ int Arch_MTime(struct GNode *); int Arch_MemMTime(struct GNode *); void Arch_FindLib(struct GNode *, struct Path *); Boolean Arch_LibOODate(struct GNode *); -void Arch_Init(void); #endif /* arch_h_488adf7a */ |
