Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pyodide
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
pyodide
Commits
8ec53afd
Commit
8ec53afd
authored
Oct 26, 2018
by
Roman Yurchak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove --old-and-unmanageable with distutils
parent
2bdba761
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
17 deletions
+4
-17
pyodide_build/pywasmcross.py
pyodide_build/pywasmcross.py
+4
-17
No files found.
pyodide_build/pywasmcross.py
View file @
8ec53afd
...
@@ -175,7 +175,6 @@ def handle_command(line, args, dryrun=False):
...
@@ -175,7 +175,6 @@ def handle_command(line, args, dryrun=False):
emcc test.c
emcc test.c
['emcc', 'test.c']
['emcc', 'test.c']
"""
"""
# This is a special case to skip the compilation tests in numpy that aren't
# This is a special case to skip the compilation tests in numpy that aren't
# actually part of the build
# actually part of the build
for
arg
in
line
:
for
arg
in
line
:
...
@@ -185,8 +184,6 @@ def handle_command(line, args, dryrun=False):
...
@@ -185,8 +184,6 @@ def handle_command(line, args, dryrun=False):
return
return
if
arg
==
'-print-multiarch'
:
if
arg
==
'-print-multiarch'
:
return
return
if
arg
.
startswith
(
'/tmp'
):
return
if
line
[
0
]
==
'gfortran'
:
if
line
[
0
]
==
'gfortran'
:
result
=
f2c
(
line
)
result
=
f2c
(
line
)
...
@@ -210,8 +207,6 @@ def handle_command(line, args, dryrun=False):
...
@@ -210,8 +207,6 @@ def handle_command(line, args, dryrun=False):
elif
new_args
[
0
]
in
(
'emcc'
,
'em++'
):
elif
new_args
[
0
]
in
(
'emcc'
,
'em++'
):
new_args
.
extend
(
args
.
cflags
.
split
())
new_args
.
extend
(
args
.
cflags
.
split
())
lapack_dir
=
None
# Go through and adjust arguments
# Go through and adjust arguments
for
arg
in
line
[
1
:]:
for
arg
in
line
[
1
:]:
if
arg
.
startswith
(
'-I'
):
if
arg
.
startswith
(
'-I'
):
...
@@ -233,15 +228,6 @@ def handle_command(line, args, dryrun=False):
...
@@ -233,15 +228,6 @@ def handle_command(line, args, dryrun=False):
elif
shared
and
arg
.
endswith
(
'.so'
):
elif
shared
and
arg
.
endswith
(
'.so'
):
arg
=
arg
[:
-
3
]
+
'.wasm'
arg
=
arg
[:
-
3
]
+
'.wasm'
output
=
arg
output
=
arg
# Fix for scipy to link to the correct BLAS/LAPACK files
if
arg
.
startswith
(
'-L'
)
and
'CLAPACK-WA'
in
arg
:
lapack_dir
=
arg
.
replace
(
'-L'
,
''
)
for
lib_name
in
[
'F2CLIBS/libf2c.bc'
,
'blas_WA.bc'
,
'lapack_WA.bc'
]:
arg
=
os
.
path
.
join
(
lapack_dir
,
f"
{
lib_name
}
"
)
new_args
.
append
(
arg
)
continue
new_args
.
append
(
arg
)
new_args
.
append
(
arg
)
...
@@ -303,9 +289,10 @@ def install_for_distribution(args):
...
@@ -303,9 +289,10 @@ def install_for_distribution(args):
try
:
try
:
subprocess
.
check_call
(
commands
)
subprocess
.
check_call
(
commands
)
except
Exception
:
except
Exception
:
# XXX: temporary hack to remove --old-and-unmanageable with distutils
print
(
f'Warning:
{
" "
.
join
(
commands
)
}
failed with distutils, possibly '
# see https://github.com/iodide-project/pyodide/issues/220
f'due to the use if distutils that does not support the '
# for a better solution.
f'--old-and-unmanageable argument. Re-trying the install '
f'without this argument.'
)
subprocess
.
check_call
(
commands
[:
-
1
])
subprocess
.
check_call
(
commands
[:
-
1
])
...
...
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