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
4803c872
Commit
4803c872
authored
Nov 22, 2020
by
Abinoam Praxedes Marques Junior
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #5177 - set MRUBY_CONFIG early
parent
39a11f32
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Rakefile
Rakefile
+2
-1
lib/mruby/build.rb
lib/mruby/build.rb
+1
-2
No files found.
Rakefile
View file @
4803c872
...
...
@@ -14,7 +14,8 @@ require "mruby/core_ext"
require
"mruby/build"
# load configuration file
MRUBY_CONFIG
=
MRuby
::
Build
.
load_config
MRUBY_CONFIG
=
MRuby
::
Build
.
mruby_config_path
load
MRUBY_CONFIG
# load basic rules
MRuby
.
each_target
do
|
build
|
...
...
lib/mruby/build.rb
View file @
4803c872
...
...
@@ -39,7 +39,7 @@ module MRuby
class
Build
class
<<
self
attr_accessor
:current
def
load_config
def
mruby_config_path
path
=
ENV
[
'MRUBY_CONFIG'
]
||
ENV
[
'CONFIG'
]
if
path
.
nil?
||
path
.
empty?
path
=
"
#{
MRUBY_ROOT
}
/build_config/default.rb"
...
...
@@ -47,7 +47,6 @@ module MRuby
f
=
"
#{
MRUBY_ROOT
}
/build_config/
#{
path
}
.rb"
path
=
File
.
exist?
(
f
)
?
f
:
File
.
extname
(
path
).
empty?
?
f
:
path
end
load
path
path
end
end
...
...
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