epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

windows choose intended make.exe

Browse Source
This commit is contained in:
Michael Davidsaver
2023-10-24 18:28:38 -07:00
parent dffe32c23e
commit f57c9d5930
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cue.py
View File

@@ -693,8 +693,10 @@ def setup_for_build(args):
if ci['os'] == 'windows': if ci['os'] == 'windows':
if os.path.exists(r'C:\Strawberry\perl\bin'): if os.path.exists(r'C:\Strawberry\perl\bin'):
# Put strawberry perl in front of the PATH (so that Git Perl is further behind) # Put strawberry perl in front of the PATH (so that Git Perl is further behind)
# Put Chocolatey\bin ahead to select correct make.exe
logger.debug('Adding Strawberry Perl in front of the PATH') logger.debug('Adding Strawberry Perl in front of the PATH')
os.environ['PATH'] = os.pathsep.join([r'C:\Strawberry\c\bin', os.environ['PATH'] = os.pathsep.join([r'C:\ProgramData\Chocolatey\bin',
r'C:\Strawberry\c\bin',
r'C:\Strawberry\perl\site\bin', r'C:\Strawberry\perl\site\bin',
r'C:\Strawberry\perl\bin', r'C:\Strawberry\perl\bin',
os.environ['PATH']]) os.environ['PATH']])