Browse Source

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

vanilla_fb_2.0.x
Victor Oliveira 4 years ago
committed by Scott Lahteine
parent
commit
d7d3827f47
  1. 6
      buildroot/share/PlatformIO/scripts/common-dependencies.py

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

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

Loading…
Cancel
Save