From 92a4ac9eb7b28a014f9f34f3c6d2e8e9463892a2 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Sun, 6 Dec 2015 19:28:39 -0800
Subject: [PATCH] make dotnet optional and recover from python installation
mismatch. Pull requests #338, #340
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
scripts/mk_util.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index 21ebb3819..51e76a148 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -1300,7 +1300,7 @@ class DLLComponent(Component):
dllfile = '%s$(SO_EXT)' % self.dll_name
dllInstallPath = os.path.join(INSTALL_LIB_DIR, dllfile)
MakeRuleCmd.install_files(out, dllfile, dllInstallPath)
- if not python_install_enabled():
+ if not is_python_install_enabled():
return
pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX)
if IS_WINDOWS:
@@ -1345,8 +1345,8 @@ class PythonInstallComponent(Component):
Component.__init__(self, name, None, [])
def main_component(self):
- return PYTHON_INSTALL_ENABLED
-
+ return is_python_install_enabled()
+
def install_deps(self, out):
if not self.main_component():
return