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
da6bbb3b
Commit
da6bbb3b
authored
Sep 21, 2018
by
Roman Yurchak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set PYTHONPATH in Makefile.envs to avoiding installing pyodide_build
parent
3ee42aa7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
6 deletions
+3
-6
.circleci/config.yml
.circleci/config.yml
+0
-3
Makefile
Makefile
+0
-2
Makefile.envs
Makefile.envs
+1
-0
packages/Makefile
packages/Makefile
+2
-1
No files found.
.circleci/config.yml
View file @
da6bbb3b
...
...
@@ -63,9 +63,6 @@ jobs:
ccache -z
make
ccache -s
# install all relevant pyodide_build files to
# the virtualenv that will be persisted
pip install .
-
save_cache
:
paths
:
...
...
Makefile
View file @
da6bbb3b
...
...
@@ -204,8 +204,6 @@ ccache/em++:
$(CPYTHONLIB)
:
emsdk/emsdk/.complete ccache/emcc ccache/em++
make
-C
$(CPYTHONROOT)
python
-m
pip
install
-e
.
"
$(HOSTPYTHONROOT)
/bin/python3"
-m
pip
install
-e
.
$(LZ4LIB)
:
...
...
Makefile.envs
View file @
da6bbb3b
export
PATH
:=
$(PYODIDE_ROOT)
/ccache:
$(PYODIDE_ROOT)
/emsdk/emsdk:
$(PYODIDE_ROOT)
/emsdk/emsdk/clang/tag-e1.38.10/build_tag-e1.38.10_64/bin:
$(PYODIDE_ROOT)
/emsdk/emsdk/node/8.9.1_64bit/bin:
$(PYODIDE_ROOT)
/emsdk/emsdk/emscripten/tag-1.38.10:
$(PYODIDE_ROOT)
/emsdk/emsdk/binaryen/tag-1.38.10_64bit_binaryen/bin:
$(PATH)
export
PYTHONPATH
:=
$(PYTHONPATH)
:
$(PYODIDE_ROOT)
/
export
EMSDK
=
$(PYODIDE_ROOT)
/emsdk/emsdk
export
EM_CONFIG
=
$(PYODIDE_ROOT)
/emsdk/emsdk/.emscripten
...
...
packages/Makefile
View file @
da6bbb3b
...
...
@@ -2,7 +2,8 @@ PYODIDE_ROOT=$(abspath ..)
include
../Makefile.envs
all
:
pyodide buildall
.
../build
--ldflags
=
"
$(SIDE_LDFLAGS)
"
--host
=
$(HOSTPYTHONROOT)
--target
=
$(TARGETPYTHONROOT)
python
-m
pyodide_build buildall
.
../build
\
--ldflags
=
"
$(SIDE_LDFLAGS)
"
--host
=
$(HOSTPYTHONROOT)
--target
=
$(TARGETPYTHONROOT)
clean
:
rm
-rf
./
*
/build
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