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

appveyor: export MAKE executable to environment

Browse Source 
Save user scripts from having to compute
This commit is contained in:
Michael Davidsaver
2020-03-29 21:24:41 -07:00
committed by Ralph Lange
parent dbfba732fd
commit 48832354da
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appveyor/do.py
View File

@@ -314,7 +314,7 @@ def add_dependency(dep):
def setup_for_build(): def setup_for_build():
global make, makeargs global make, makeargs
make = os.path.join(toolsdir, 'make') make = os.path.join(toolsdir, 'make.exe')
makeargs = ['-j2', '-Otarget'] makeargs = ['-j2', '-Otarget']
# no parallel make for Base 3.14 # no parallel make for Base 3.14
with open(os.path.join(cachedir, 'RELEASE.local'), 'r') as f: with open(os.path.join(cachedir, 'RELEASE.local'), 'r') as f:
@@ -472,6 +472,7 @@ def test(args):
def doExec(args): def doExec(args):
'exec user command with vcvars' 'exec user command with vcvars'
setup_for_build() setup_for_build()
os.environ['MAKE'] = make
print('Execute command {}'.format(args.cmd)) print('Execute command {}'.format(args.cmd))
sys.stdout.flush() sys.stdout.flush()
sp.check_call(' '.join(args.cmd), shell=True) sp.check_call(' '.join(args.cmd), shell=True)