Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
d4b92e93
Unverified
Commit
d4b92e93
authored
6 years ago
by
Martine Lenders
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #10789 from cladmi/pr/build_dir/fix_jerryscript
pkg/jerryscript: namespace BUILD_DIR variable
parents
c0785df0
6a170583
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pkg/jerryscript/Makefile.jerryscript
+6
-6
6 additions, 6 deletions
pkg/jerryscript/Makefile.jerryscript
with
6 additions
and
6 deletions
pkg/jerryscript/Makefile.jerryscript
+
6
−
6
View file @
d4b92e93
BUILD_DIR
?=
$(
BINDIR
)
/jerryscript
JERRYSCRIPT_
BUILD_DIR
?=
$(
BINDIR
)
/jerryscript
JERRYHEAP
?=
16
JERRYHEAP
?=
16
...
@@ -27,7 +27,7 @@ endif
...
@@ -27,7 +27,7 @@ endif
all
:
libjerry
all
:
libjerry
libjerry
:
libjerry
:
cmake
-B
$(
BUILD_DIR
)
-H
./
\
cmake
-B
$(
JERRYSCRIPT_
BUILD_DIR
)
-H
./
\
-DCMAKE_SYSTEM_NAME
=
RIOT
\
-DCMAKE_SYSTEM_NAME
=
RIOT
\
-DCMAKE_SYSTEM_PROCESSOR
=
"
$(
MCPU
)
"
\
-DCMAKE_SYSTEM_PROCESSOR
=
"
$(
MCPU
)
"
\
-DCMAKE_C_COMPILER
=
$(
CC
)
\
-DCMAKE_C_COMPILER
=
$(
CC
)
\
...
@@ -42,7 +42,7 @@ libjerry:
...
@@ -42,7 +42,7 @@ libjerry:
-DEXTERNAL_COMPILE_FLAGS
=
"
$(
INCLUDES
)
$(
EXT_CFLAGS
)
"
\
-DEXTERNAL_COMPILE_FLAGS
=
"
$(
INCLUDES
)
$(
EXT_CFLAGS
)
"
\
-DMEM_HEAP_SIZE_KB
=
$(
JERRYHEAP
)
-DMEM_HEAP_SIZE_KB
=
$(
JERRYHEAP
)
"$(MAKE)"
-C
$(BUILD_DIR)
jerry-core
jerry-ext
jerry-port-default-minimal
"$(MAKE)"
-C
$(
JERRYSCRIPT_
BUILD_DIR)
jerry-core
jerry-ext
jerry-port-default-minimal
cp
$(BUILD_DIR)/lib/libjerry-core.a
$(BINDIR)/jerryscript.a
cp
$(
JERRYSCRIPT_
BUILD_DIR)/lib/libjerry-core.a
$(BINDIR)/jerryscript.a
cp
$(BUILD_DIR)/lib/libjerry-ext.a
$(BINDIR)/jerryscript-ext.a
cp
$(
JERRYSCRIPT_
BUILD_DIR)/lib/libjerry-ext.a
$(BINDIR)/jerryscript-ext.a
cp
$(BUILD_DIR)/lib/libjerry-port-default-minimal.a
$(BINDIR)/jerryport-minimal.a
cp
$(
JERRYSCRIPT_
BUILD_DIR)/lib/libjerry-port-default-minimal.a
$(BINDIR)/jerryport-minimal.a
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment