41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
--- rustc-1.30.1-src/src/bootstrap/configure.py.orig 2018-11-10 03:13:51.191178900 +0300
|
|
+++ rustc-1.30.1-src/src/bootstrap/configure.py 2018-11-10 03:16:36.580638600 +0300
|
|
@@ -279,6 +279,11 @@
|
|
arr[part] = {}
|
|
arr = arr[part]
|
|
|
|
+def exe_suffix():
|
|
+ """Return a suffix for executables"""
|
|
+ if sys.platform == 'win32':
|
|
+ return '.exe'
|
|
+ return ''
|
|
|
|
for key in known_args:
|
|
# The `set` option is special and can be passed a bunch of times
|
|
@@ -311,18 +316,18 @@
|
|
set('llvm.ccache', 'sccache')
|
|
elif option.name == 'local-rust':
|
|
for path in os.environ['PATH'].split(os.pathsep):
|
|
- if os.path.exists(path + '/rustc'):
|
|
- set('build.rustc', path + '/rustc')
|
|
+ if os.path.exists(path + '/rustc' + exe_suffix()):
|
|
+ set('build.rustc', path + '/rustc' + exe_suffix())
|
|
break
|
|
for path in os.environ['PATH'].split(os.pathsep):
|
|
- if os.path.exists(path + '/cargo'):
|
|
- set('build.cargo', path + '/cargo')
|
|
+ if os.path.exists(path + '/cargo' + exe_suffix()):
|
|
+ set('build.cargo', path + '/cargo' + exe_suffix())
|
|
break
|
|
elif option.name == 'local-rust-root':
|
|
- set('build.rustc', value + '/bin/rustc')
|
|
- set('build.cargo', value + '/bin/cargo')
|
|
+ set('build.rustc', value + '/bin/rustc' + exe_suffix())
|
|
+ set('build.cargo', value + '/bin/cargo' + exe_suffix())
|
|
elif option.name == 'llvm-root':
|
|
- set('target.{}.llvm-config'.format(build()), value + '/bin/llvm-config')
|
|
+ set('target.{}.llvm-config'.format(build()), value + '/bin/llvm-config' + exe_suffix())
|
|
elif option.name == 'jemalloc-root':
|
|
set('target.{}.jemalloc'.format(build()), value + '/libjemalloc.a')
|
|
elif option.name == 'tools':
|