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
ccd852c2
Commit
ccd852c2
authored
Oct 15, 2018
by
Michael Droettboom
Committed by
GitHub
Oct 15, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #219 from rth/fix-symlink-generation
MAINT Allow re-creating broken symlinks under tools/
parents
e24c610a
fe7e181b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
Dockerfile
Dockerfile
+1
-1
pyodide_build/pywasmcross.py
pyodide_build/pywasmcross.py
+3
-0
No files found.
Dockerfile
View file @
ccd852c2
...
...
@@ -4,7 +4,7 @@ FROM circleci/python:3.7.0-stretch-browsers
# Set up the Debian testing repo, and then install g++ from there...
RUN
sudo
bash
-c
"echo
\"
deb http://ftp.us.debian.org/debian testing main contrib non-free
\"
>> /etc/apt/sources.list"
\
&&
sudo
apt-get update
\
&&
sudo
apt-get
install
node-less cmake build-essential clang-format-6.0 uglifyjs chromium ccache
\
&&
sudo
apt-get
install
node-less cmake build-essential clang-format-6.0 uglifyjs chromium ccache
libncurses6
\
&&
sudo
apt-get
install
-t
testing g++-8
\
&&
sudo
update-alternatives
--install
/usr/bin/gcc gcc /usr/bin/gcc-6 60
--slave
/usr/bin/g++ g++ /usr/bin/g++-6
\
&&
sudo
update-alternatives
--install
/usr/bin/gcc gcc /usr/bin/gcc-8 80
--slave
/usr/bin/g++ g++ /usr/bin/g++-8
\
...
...
pyodide_build/pywasmcross.py
View file @
ccd852c2
...
...
@@ -77,6 +77,9 @@ def make_symlinks(env):
exec_path
=
Path
(
__file__
).
resolve
()
for
symlink
in
symlinks
:
symlink_path
=
ROOTDIR
/
symlink
if
os
.
path
.
lexists
(
symlink_path
)
and
not
symlink_path
.
exists
():
# remove broken symlink so it can be re-created
symlink_path
.
unlink
()
if
not
symlink_path
.
exists
():
symlink_path
.
symlink_to
(
exec_path
)
if
symlink
==
'c++'
:
...
...
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