zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix compiler search in non-default PIO installs (#18960)

Browse source
This commit is contained in:
Victor Oliveira 2020-08-08 20:40:12 -03:00 committed by Scott Lahteine
parent ad30383b46
commit d7d3827f47
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildroot/share/PlatformIO/scripts/common-dependencies.py
View file

@ -156,16 +156,16 @@ def search_compiler():
# Find the current platform compiler by searching the $PATH # Find the current platform compiler by searching the $PATH
if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32':
path_separator = ';' path_separator = ';'
path_regex = r'platformio\\packages.*\\bin' path_regex = re.escape(env['PROJECT_PACKAGES_DIR']) + r'.*\\bin'
gcc = "g++.exe" gcc = "g++.exe"
else: else:
path_separator = ':' path_separator = ':'
path_regex = r'platformio/packages.*/bin' path_regex = re.escape(env['PROJECT_PACKAGES_DIR']) + r'.*/bin'
gcc = "g++" gcc = "g++"
# Search for the compiler # Search for the compiler
for path in env['ENV']['PATH'].split(path_separator): for path in env['ENV']['PATH'].split(path_separator):
if not re.search(path_regex, path): if not re.search(path_regex, path, re.IGNORECASE):
continue continue
for file in os.listdir(path): for file in os.listdir(path):
if not file.endswith(gcc): if not file.endswith(gcc):