diff --git a/cue.py b/cue.py index 7d8db00..2185489 100644 --- a/cue.py +++ b/cue.py @@ -838,17 +838,14 @@ CROSS_COMPILER_TARGET_ARCHS += windows-x64-mingw''') RTEMS_VERSION={0} RTEMS_BASE={1}'''.format(os.environ['RTEMS'], rtemsdir)) - # Patch Base 3.15 that doesn't have -qemu target architecture - if not os.path.exists(os.path.join(places['EPICS_BASE'], 'configure', 'os', + # Base 3.15 doesn't have -qemu target architecture + qemu_suffix = '' + if os.path.exists(os.path.join(places['EPICS_BASE'], 'configure', 'os', 'CONFIG.Common.RTEMS-pc386-qemu')): - print('Adding RTEMS-pc386-qemu target to Base in {0}'.format(places['EPICS_BASE'])) - sys.stdout.flush() - sp.check_call(['patch', '-p1', '-i', - os.path.join(ci['scriptsdir'], 'add-RTEMS-pc368-qemu-target.patch')], - cwd=places['EPICS_BASE']) + qemu_suffix = '-qemu' with open(os.path.join(places['EPICS_BASE'], 'configure', 'CONFIG_SITE'), 'a') as f: f.write(''' -CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu''') +CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386{0}'''.format(qemu_suffix)) host_ccmplr_name = re.sub(r'^([a-zA-Z][^-]*(-[a-zA-Z][^-]*)*)+(-[0-9.]|)$', r'\1', ci['compiler']) host_cmplr_ver_suffix = re.sub(r'^([a-zA-Z][^-]*(-[a-zA-Z][^-]*)*)+(-[0-9.]|)$', r'\3', ci['compiler'])