Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
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
Libraries
mruby
Commits
60598342
Unverified
Commit
60598342
authored
Nov 27, 2020
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
Nov 27, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5196 from shuujii/fix-build-failure
Fix build failure; ref #5194
parents
13fc5034
fdce0e71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Rakefile
Rakefile
+3
-1
tasks/presym.rake
tasks/presym.rake
+3
-5
No files found.
Rakefile
View file @
60598342
...
...
@@ -93,7 +93,9 @@ MRuby.each_target do |target|
end
desc
"preallocated symbols"
task
:gensym
=>
MRuby
.
targets
.
values
.
map
(
&
:presym_file
)
task
:gensym
do
MRuby
.
each_target
{
|
build
|
Rake
::
Task
[
build
.
presym_file
].
invoke
}
end
depfiles
+=
MRuby
.
targets
.
map
{
|
n
,
t
|
t
.
libraries
...
...
tasks/presym.rake
View file @
60598342
...
...
@@ -41,11 +41,9 @@ macro_to_symbol = {
[
""
,
""
]
=>
[
""
,
""
],
}
core_cfiles
=
nil
core_rbfiles
=
nil
core_cfiles
=
Dir
.
glob
(
"
#{
MRUBY_ROOT
}
/src/*.c"
)
core_rbfiles
=
Dir
.
glob
(
"
#{
MRUBY_ROOT
}
/mrblib/*.rb"
)
MRuby
.
each_target
do
|
build
|
core_cfiles
||=
Dir
.
glob
(
"
#{
MRUBY_ROOT
}
/src/*.c"
)
core_rbfiles
||=
Dir
.
glob
(
"
#{
MRUBY_ROOT
}
/mrblib/*.rb"
)
cfiles
=
core_cfiles
.
dup
rbfiles
=
core_rbfiles
.
dup
psfiles
=
[]
...
...
@@ -58,8 +56,8 @@ MRuby.each_target do |build|
if
gem
.
cdump?
rbfiles
.
concat
(
gem
.
rbfiles
)
psfiles
.
concat
(
Dir
.
glob
(
gem
.
dir
+
"/**/presym"
))
gem
.
compilers
.
each
{
|
c
|
c
.
include_paths
<<
"
#{
build
.
build_dir
}
/include"
}
end
gem
.
compilers
.
each
{
|
c
|
c
.
include_paths
<<
"
#{
build
.
build_dir
}
/include"
}
end
file
presym_file
=>
[
*
cfiles
,
*
rbfiles
,
*
psfiles
,
__FILE__
]
do
...
...
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