Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
8625d3fa
Commit
8625d3fa
authored
Sep 30, 2013
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Plain Diff
Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary.
Patch by Oscar Benjamin.
parents
387bb1d4
5cc44b40
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
7 deletions
+17
-7
cygwinccompiler.py
cygwinccompiler.py
+17
-7
No files found.
cygwinccompiler.py
View file @
8625d3fa
...
@@ -48,13 +48,14 @@ cygwin in no-cygwin mode).
...
@@ -48,13 +48,14 @@ cygwin in no-cygwin mode).
import
os
import
os
import
sys
import
sys
import
copy
import
copy
from
subprocess
import
Popen
,
PIPE
from
subprocess
import
Popen
,
PIPE
,
check_output
import
re
import
re
from
distutils.ccompiler
import
gen_preprocess_options
,
gen_lib_options
from
distutils.ccompiler
import
gen_preprocess_options
,
gen_lib_options
from
distutils.unixccompiler
import
UnixCCompiler
from
distutils.unixccompiler
import
UnixCCompiler
from
distutils.file_util
import
write_file
from
distutils.file_util
import
write_file
from
distutils.errors
import
DistutilsExecError
,
CompileError
,
UnknownFileError
from
distutils.errors
import
(
DistutilsExecError
,
CCompilerError
,
CompileError
,
UnknownFileError
)
from
distutils
import
log
from
distutils
import
log
from
distutils.version
import
LooseVersion
from
distutils.version
import
LooseVersion
from
distutils.spawn
import
find_executable
from
distutils.spawn
import
find_executable
...
@@ -294,11 +295,15 @@ class Mingw32CCompiler(CygwinCCompiler):
...
@@ -294,11 +295,15 @@ class Mingw32CCompiler(CygwinCCompiler):
else
:
else
:
entry_point
=
''
entry_point
=
''
self
.
set_executables
(
compiler
=
'gcc -mno-cygwin -O -Wall'
,
if
is_cygwingcc
():
compiler_so
=
'gcc -mno-cygwin -mdll -O -Wall'
,
raise
CCompilerError
(
compiler_cxx
=
'g++ -mno-cygwin -O -Wall'
,
'Cygwin gcc cannot be used with --compiler=mingw32'
)
linker_exe
=
'gcc -mno-cygwin'
,
linker_so
=
'%s -mno-cygwin %s %s'
self
.
set_executables
(
compiler
=
'gcc -O -Wall'
,
compiler_so
=
'gcc -mdll -O -Wall'
,
compiler_cxx
=
'g++ -O -Wall'
,
linker_exe
=
'gcc'
,
linker_so
=
'%s %s %s'
%
(
self
.
linker_dll
,
shared_option
,
%
(
self
.
linker_dll
,
shared_option
,
entry_point
))
entry_point
))
# Maybe we should also append -mthreads, but then the finished
# Maybe we should also append -mthreads, but then the finished
...
@@ -393,3 +398,8 @@ def get_versions():
...
@@ -393,3 +398,8 @@ def get_versions():
"""
"""
commands = ['
gcc
-
dumpversion
', '
ld
-
v
', '
dllwrap
--
version
']
commands = ['
gcc
-
dumpversion
', '
ld
-
v
', '
dllwrap
--
version
']
return tuple([_find_exe_version(cmd) for cmd in commands])
return tuple([_find_exe_version(cmd) for cmd in commands])
def is_cygwingcc():
'''Try to determine if the gcc that would be used is from cygwin.'''
out_string = check_output(['
gcc
', '
-
dumpmachine
'])
return out_string.strip().endswith(b'
cygwin
')
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment