diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-09-13 09:32:01 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-09-15 04:29:47 +0530 |
| commit | 76ad5db837e51f3e428b481cf8cb115d62a8454d (patch) | |
| tree | 7dd2c042c6be35df71d3ce35815f10d14ef9bd65 /config/windows.config | |
| parent | 60dcc5d605206a0c1e044f17b012a1fc8560308a (diff) | |
config/*: Don't assume that the toolchain exists
Now when we run bootstrap for the first time, the config is generated
once on startup, and then reused for all recipes. The toolchain does
not exist at that time.
Diffstat (limited to 'config/windows.config')
| -rw-r--r-- | config/windows.config | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config/windows.config b/config/windows.config index 6b5ce417..c49318d2 100644 --- a/config/windows.config +++ b/config/windows.config @@ -48,11 +48,7 @@ if not mingw_perl_prefix: mingw_perl_prefix = os.path.join(home_dir, 'mingw', 'perl') if not tools_prefix: - tools_prefix = host+'-' - __cc_candidate = os.path.join(toolchain_prefix, 'bin', '%sgcc' % tools_prefix) - # Check for a multilib toolchain - if not os.path.exists(__cc_candidate): - tools_prefix = 'x86_64-w64-mingw32-' + tools_prefix = 'x86_64-w64-mingw32-' def cmd(command): return '%s%s' % (tools_prefix, command) @@ -90,7 +86,7 @@ if not for_shell or 'novisualstudio' in variants: env['RC']= cmd('windres') + ' ' + arch_rcflags # MinGW toolchain PATH toolchainbin = os.path.join(toolchain_prefix, 'bin') - if os.path.isdir(toolchainbin) and toolchainbin not in env['PATH']: + if toolchainbin not in env['PATH']: env['PATH'] = '%s%s%s' % (toolchainbin, separator, env['PATH']) libexecdir = os.path.join(toolchain_prefix, "libexec/gcc/x86_64-w64-mingw32/8.2.0/") env['PATH'] = '%s%s%s' % (libexecdir, separator, env['PATH']) |