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
156dd27f
Commit
156dd27f
authored
Jul 23, 2015
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2896 from sagmor/custom-gcc-version
Add ability to change compiler versions for androideabi
parents
0f5386db
f0170447
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
tasks/toolchains/androideabi.rake
tasks/toolchains/androideabi.rake
+4
-2
No files found.
tasks/toolchains/androideabi.rake
View file @
156dd27f
...
...
@@ -27,6 +27,8 @@ MRuby::Toolchain.new(:androideabi) do |conf|
ANDROID_TARGET_ARCH
=
ENV
[
'ANDROID_TARGET_ARCH'
]
||
DEFAULT_ANDROID_TARGET_ARCH
ANDROID_TARGET_ARCH_ABI
=
ENV
[
'ANDROID_TARGET_ARCH_ABI'
]
||
DEFAULT_ANDROID_TARGET_ARCH_ABI
ANDROID_TOOLCHAIN
=
ENV
[
'ANDROID_TOOLCHAIN'
]
||
DEFAULT_ANDROID_TOOLCHAIN
GCC_VERSION
=
ENV
[
'GCC_VERSION'
]
||
GCC_VERSION
CLANG_VERSION
=
ENV
[
'CLANG_VERSION'
]
||
CLANG_VERSION
case
ANDROID_TARGET_ARCH
.
downcase
when
'arch-arm'
,
'arm'
then
...
...
@@ -74,9 +76,9 @@ MRuby::Toolchain.new(:androideabi) do |conf|
else
# Any other architecture are not supported by Android NDK.
end
path_to_toolchain
+=
DEFAULT_
GCC_VERSION
+
'/prebuilt/'
+
HOST_PLATFORM
path_to_toolchain
+=
GCC_VERSION
+
'/prebuilt/'
+
HOST_PLATFORM
else
path_to_toolchain
+=
'llvm-'
+
DEFAULT_
CLANG_VERSION
+
'/prebuilt/'
+
HOST_PLATFORM
path_to_toolchain
+=
'llvm-'
+
CLANG_VERSION
+
'/prebuilt/'
+
HOST_PLATFORM
end
else
path_to_toolchain
=
ANDROID_STANDALONE_TOOLCHAIN
...
...
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