From be51e46d04ff0e346ee53852855ac26e31bb9c0c Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 26 Aug 2019 13:13:28 -0500 Subject: [PATCH] WINNT: Build bubasics before audit Commit 9ebff4c6 (OPENAFS-SA-2018-001 audit: support butc types) made src/audit require the butc.h header, and updated Makefile.in to reflect this. However, this dir is also built on WINNT, and the NTMakefile was not updated to reflect this dependency. As a result, we might fail to build src/audit on WINNT, since butc.h may not exist yet, and we get an error like: cl [...] /c audit.c audit.c cl : Command line warning D9025 : overriding '/W4' with '/W3' audit.c(27) : fatal error C1083: Cannot open include file: 'afs/butc.h': No such file or directory NMAKE : fatal error U1077: 'C:\PROGRA~2\MICROS~1.0\VC\bin\amd64\cl.EXE' : return code '0x2' To fix this, move 'bubasics' to be made before 'audit' in NTMakefile, so butc.h is available when we build 'audit'. Reviewed-on: https://gerrit.openafs.org/13813 Reviewed-by: Benjamin Kaduk Tested-by: Benjamin Kaduk (cherry picked from commit 9eeb3ec09f5421ceab2be415a193bb3a3c44925f) Change-Id: If36de5664ea0eb7208810c224d30092f0a4d1745 Reviewed-on: https://gerrit.openafs.org/13848 Reviewed-by: Andrew Deason Reviewed-by: Michael Meffie Reviewed-by: Marcio Brito Barbosa Reviewed-by: Stephan Wiesand Tested-by: Stephan Wiesand --- NTMakefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/NTMakefile b/NTMakefile index 4b28fda3fb..4fae9e8840 100644 --- a/NTMakefile +++ b/NTMakefile @@ -257,7 +257,14 @@ fsint: procmgmt $(NTMAKE) $(CD) ..\.. -audit: fsint +bubasics: fsint + @echo ***** $@ + $(DOCD) $(SRC)\$@ + $(CD) $(SRC)\$@ + $(NTMAKE) + $(CD) ..\.. + +audit: bubasics @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ @@ -362,14 +369,7 @@ usd: vlserver $(NTMAKE) $(CD) ..\.. -bubasics: usd - @echo ***** $@ - $(DOCD) $(SRC)\$@ - $(CD) $(SRC)\$@ - $(NTMAKE) - $(CD) ..\.. - -budb: bubasics +budb: usd @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@