From d9e1df23679dcea9e95abaf753c22dcf184181d7 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 25 Mar 2020 17:34:05 +0100 Subject: [PATCH] appveyor: add HOST_ARCH suffix for -debug and -static --- appveyor/do.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/appveyor/do.py b/appveyor/do.py index 465df0e..4462d42 100644 --- a/appveyor/do.py +++ b/appveyor/do.py @@ -324,10 +324,19 @@ def setup_for_build(): if 'BASE_3_14=YES' in myfile.read(): makeargs = [] + # there is no combined static and debug EPICS_HOST_ARCH target, + # so a combined debug and static target will appear to be just static + # but debug will have been specified in CONFIG_SITE by prepare() + hostarchsuffix='' + if re.search('debug', os.environ['CONFIGURATION']): + hostarchsuffix = '-debug' + if re.search('static', os.environ['CONFIGURATION']): + hostarchsuffix = '-static' + if os.environ['PLATFORM'].lower() == 'x86': - os.environ['EPICS_HOST_ARCH'] = 'win32-x86' + os.environ['EPICS_HOST_ARCH'] = 'win32-x86' + hostarchsuffix elif os.environ['PLATFORM'].lower() == 'x64': - os.environ['EPICS_HOST_ARCH'] = 'windows-x64' + os.environ['EPICS_HOST_ARCH'] = 'windows-x64' + hostarchsuffix if os.environ['CC'] == 'vs2019': # put our strawberry 'perl' in the PATH