public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* Increase robustness of nmake BaseTools build for space also used by make
@ 2019-09-07 22:10 Burt Silverman
  2019-09-08  2:10 ` [edk2-devel] " Burt Silverman
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Burt Silverman @ 2019-09-07 22:10 UTC (permalink / raw)
  To: devel


[-- Attachment #1.1: Type: text/plain, Size: 653 bytes --]

Author: Burt Silverman <burtms@gmail.com>
Date:   Sat Sep 7 16:33:53 2019 -0400

Improve robustness for multiple build environments

When building BaseTools, GNUmakefile builds create directory
BaseTools/Source/C/libs/. On the other hand, Makefile builds use libs
as an nmake pseudo target, so it either must NOT exist as a file or
directory, OR it must phony dependency like .PHONY. The latter
solution conflicts with NmakeSubdirs.py. Therefore, I make it go away
in the cleanall target. I could also add it to the clean target, but
it strikes me that cleanall should be more forceful.

Signed-off-by: Burt Silverman <burtms@gmail.com>

[-- Attachment #1.2: Type: text/html, Size: 896 bytes --]

[-- Attachment #2: 0001-Improve-robustness-for-multiple-build-environments.patch --]
[-- Type: application/octet-stream, Size: 1421 bytes --]

From 21db9399234705549f518ec1838199ad675d1faf Mon Sep 17 00:00:00 2001
From: Burt Silverman <burtms@gmail.com>
Date: Sat, 7 Sep 2019 16:33:53 -0400
Subject: [PATCH] BaseTools: Robustness for multiple build environments

When building BaseTools, GNUmakefile builds create directory
BaseTools/Source/C/libs/. On the other hand, Makefile builds use libs
as an nmake pseudo target, so it either must NOT exist as a file or
directory, OR it must phony dependency like .PHONY. The latter
solution conflicts with NmakeSubdirs.py. Therefore, I make it go away
in the cleanall target. I could also add it to the clean target, but
it strikes me that cleanall should be more forceful.

Signed-off-by: Burt Silverman <burtms@gmail.com>
---
 BaseTools/Source/C/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/Source/C/Makefile b/BaseTools/Source/C/Makefile
index 217fc2b91d..e8f8abe59a 100644
--- a/BaseTools/Source/C/Makefile
+++ b/BaseTools/Source/C/Makefile
@@ -63,6 +63,8 @@ clean:
 cleanall:
   @if defined PYTHON_COMMAND $(PYTHON_COMMAND) Makefiles\NmakeSubdirs.py cleanall $(LIBRARIES) $(APPLICATIONS)
   @if not defined PYTHON_COMMAND $(PYTHON_HOME)\python.exe Makefiles\NmakeSubdirs.py cleanall $(LIBRARIES) $(APPLICATIONS)
+# Next line protects the libs pseudo target from inadvertent GNU make activity
+  if exist libs RMDIR /S /Q libs
 
 !INCLUDE Makefiles\ms.rule
 
-- 
2.23.0.windows.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-12  1:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-07 22:10 Increase robustness of nmake BaseTools build for space also used by make Burt Silverman
2019-09-08  2:10 ` [edk2-devel] " Burt Silverman
2019-09-10 15:22 ` Liming Gao
     [not found] ` <15C31CFD7A1D3751.1448@groups.io>
2019-09-12  1:20   ` Liming Gao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox