summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/scripts/git_submodule.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index ba08a4e2c..48913cb72 100644
--- a/tools/scripts/git_submodule.py
+++ b/tools/scripts/git_submodule.py
@@ -142,12 +142,16 @@ class Submodule:
return True
if 'all' in self.os:
return True
- if (sys.platform.startswith('win32') or sys.platform.startswith('cygwin')) and 'win' in self.os:
- return True
if sys.platform.startswith('linux') and 'unix' in self.os:
return True
if sys.platform.startswith('darwin') and ('unix' in self.os or 'mac' in self.os):
return True
+ if sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
+ if 'win' in self.os:
+ return True
+ else:
+ # Skipping all dependecies of the extra_os on Windows platform, because it caused confict.
+ return False
for os in extra_os:
if os in self.os:
return True