From 7881b3527c25e018446f3bfec8f5f648900b1c2b Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 25 Mar 2020 16:40:17 +0100 Subject: [PATCH] appveyor: fix for older vcvars.bat manipulating PLATFORM --- appveyor/do.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor/do.py b/appveyor/do.py index acf2cba..465df0e 100644 --- a/appveyor/do.py +++ b/appveyor/do.py @@ -324,9 +324,9 @@ def setup_for_build(): if 'BASE_3_14=YES' in myfile.read(): makeargs = [] - if os.environ['PLATFORM'] == 'x86': + if os.environ['PLATFORM'].lower() == 'x86': os.environ['EPICS_HOST_ARCH'] = 'win32-x86' - elif os.environ['PLATFORM'] == 'x64': + elif os.environ['PLATFORM'].lower() == 'x64': os.environ['EPICS_HOST_ARCH'] = 'windows-x64' if os.environ['CC'] == 'vs2019': @@ -337,13 +337,13 @@ def setup_for_build(): if os.environ['CC'] == 'mingw': if 'INCLUDE' not in os.environ: os.environ['INCLUDE'] = '' - if os.environ['PLATFORM'] == 'x86': + if os.environ['PLATFORM'].lower() == 'x86': os.environ['EPICS_HOST_ARCH'] = 'win32-x86-mingw' os.environ['INCLUDE'] = os.pathsep.join([r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include', os.environ['INCLUDE']]) os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin', os.environ['PATH']]) - elif os.environ['PLATFORM'] == 'x64': + elif os.environ['PLATFORM'].lower() == 'x64': os.environ['EPICS_HOST_ARCH'] = 'windows-x64-mingw' os.environ['INCLUDE'] = os.pathsep.join([r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include', os.environ['INCLUDE']]) @@ -476,7 +476,7 @@ def with_vcvars(cmd): info['arch'] = { 'x86':'x86', # 'amd64_x86' ?? 'x64':'amd64', - }[os.environ['PLATFORM']] # 'x86' or 'x64' + }[os.environ['PLATFORM'].lower()] # 'x86' or 'x64' info['vcvars'] = { # https://en.wikipedia.org/wiki/Microsoft_Visual_Studio#History