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
336f0de8
Commit
336f0de8
authored
Oct 27, 2020
by
dearblue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed build with `conf.enable_cxx_exception`
The problem was manifested by commit
5069fb15
.
parent
07224f8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+0
-1
mrbgems/mruby-compiler/mrbgem.rake
mrbgems/mruby-compiler/mrbgem.rake
+1
-1
src/mruby_core.rake
src/mruby_core.rake
+2
-2
No files found.
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
View file @
336f0de8
...
...
@@ -18,7 +18,6 @@
#include <mruby/dump.h>
#include <mruby/string.h>
#include <mruby/variable.h>
#include <mruby/throw.h>
#include <stdlib.h>
#include <string.h>
...
...
mrbgems/mruby-compiler/mrbgem.rake
View file @
336f0de8
...
...
@@ -5,7 +5,7 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec|
lex_def
=
"
#{
dir
}
/core/lex.def"
core_objs
=
Dir
.
glob
(
"
#{
dir
}
/core/*.c"
).
map
{
|
f
|
next
nil
if
build
.
cxx_exception_enabled?
and
f
=~
/(codegen
)
.c$/
next
nil
if
build
.
cxx_exception_enabled?
and
f
=~
/(codegen
|y\.tab)\
.c$/
objfile
(
f
.
pathmap
(
"
#{
build_dir
}
/core/%n"
))
}.
compact
...
...
src/mruby_core.rake
View file @
336f0de8
...
...
@@ -4,12 +4,12 @@ MRuby.each_target do
current_build_dir
=
"
#{
build_dir
}
/
#{
relative_from_root
}
"
objs
=
Dir
.
glob
(
"
#{
current_dir
}
/*.c"
).
map
{
|
f
|
next
nil
if
cxx_exception_enabled?
and
f
=~
/(error|vm
)
.c$/
next
nil
if
cxx_exception_enabled?
and
f
=~
/(error|vm
|gc)\
.c$/
objfile
(
f
.
pathmap
(
"
#{
current_build_dir
}
/%n"
))
}.
compact
if
cxx_exception_enabled?
objs
+=
%w(vm error)
.
map
{
|
v
|
compile_as_cxx
"
#{
current_dir
}
/
#{
v
}
.c"
,
"
#{
current_build_dir
}
/
#{
v
}
.cxx"
}
objs
+=
%w(vm error
gc
)
.
map
{
|
v
|
compile_as_cxx
"
#{
current_dir
}
/
#{
v
}
.c"
,
"
#{
current_build_dir
}
/
#{
v
}
.cxx"
}
end
self
.
libmruby_objs
<<
objs
...
...
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