BaseTools: Rationalise makefile generation

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / IncludesAutoGen.py

diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
index 1ca1798907ef9b46a17d8938bb2f673d5ade662f..ca9e02d19b4afad82241abb8e15845731cabd22f 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py
@@ -2,6 +2,7 @@
 # Build cache intermediate result and state\r
 #\r
 # Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2020, ARM Limited. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 from Common.caching import cached_property\r
@@ -12,20 +13,6 @@ from Common.Misc import SaveFileOnChange, PathClass
 from Common.Misc import TemplateString\r
 import sys\r
 gIsFileMap = {}\r
-if sys.platform == "win32":\r
-    _INCLUDE_DEPS_TEMPLATE = TemplateString('''\r
-${BEGIN}\r
-!IF EXIST(${deps_file})\r
-!INCLUDE ${deps_file}\r
-!ENDIF\r
-${END}\r
-        ''')\r
-else:\r
-    _INCLUDE_DEPS_TEMPLATE = TemplateString('''\r
-${BEGIN}\r
--include ${deps_file}\r
-${END}\r
-        ''')\r
 \r
 DEP_FILE_TAIL = "# Updated \n"\r
 \r
@@ -59,6 +46,25 @@ class IncludesAutoGen():
 \r
     def CreateDepsInclude(self):\r
         deps_file = {'deps_file':self.deps_files}\r
+\r
+        MakePath = self.module_autogen.BuildOption.get('MAKE', {}).get('PATH')\r
+        if not MakePath:\r
+            EdkLogger.error("build", PARAMETER_MISSING, Message="No Make path available.")\r
+        elif "nmake" in MakePath:\r
+            _INCLUDE_DEPS_TEMPLATE = TemplateString('''\r
+        ${BEGIN}\r
+        !IF EXIST(${deps_file})\r
+        !INCLUDE ${deps_file}\r
+        !ENDIF\r
+        ${END}\r
+               ''')\r
+        else:\r
+            _INCLUDE_DEPS_TEMPLATE = TemplateString('''\r
+        ${BEGIN}\r
+        -include ${deps_file}\r
+        ${END}\r
+               ''')\r
+\r
         try:\r
             deps_include_str = _INCLUDE_DEPS_TEMPLATE.Replace(deps_file)\r
         except Exception as e:\r