admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6013 from CaptainJet/master

Browse Source 
Fix Android toolchain
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-05-26 12:47:08 +09:00
committed by GitHub
parent 2ad3f0e34b fb727a169f
commit 8914c2318c
4 changed files with 14 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_config/android_arm64_v8a.rb
+2 -2
View File
@@ -2,8 +2,8 @@
MRuby::CrossBuild.new('android-arm64-v8a') do |conf|
params = {
:arch => 'arm64-v8a',
:sdk_version => 26,
:toolchain => :clang,
:sdk_version => 33,
:toolchain => :clang
}
toolchain :android, params
build_config/android_armeabi.rb
-11
View File
@@ -1,11 +0,0 @@
# Requires Android NDK r13 or later.
MRuby::CrossBuild.new('android-armeabi') do |conf|
params = {
:arch => 'armeabi',
:sdk_version => 26,
:toolchain => :clang,
}
toolchain :android, params
conf.gembox 'default'
end
build_config/android_armeabi_v7a_neon_hard.rb
+2 -2
View File
@@ -4,8 +4,8 @@ MRuby::CrossBuild.new('android-armeabi-v7a-neon-hard') do |conf|
:arch => 'armeabi-v7a',
:mfpu => 'neon',
:mfloat_abi => 'hard',
:sdk_version => 26,
:toolchain => :clang,
:sdk_version => 33,
:toolchain => :clang
}
toolchain :android, params
tasks/toolchains/android.rake
+10 -94
View File
@@ -2,7 +2,7 @@ require "json"
class MRuby::Toolchain::Android
DEFAULT_ARCH = 'armeabi' # TODO : Revise if arch should have a default
DEFAULT_ARCH = 'armeabi-v7a' # TODO : Revise if arch should have a default
DEFAULT_TOOLCHAIN = :clang
@@ -15,14 +15,14 @@ class MRuby::Toolchain::Android
%LOCALAPPDATA%/Android/Sdk/ndk/*
~/Library/Android/sdk/ndk-bundle
~/Library/Android/ndk
/opt/android-ndk
}
TOOLCHAINS = [:clang, :gcc]
TOOLCHAINS = [:clang]
ARCHITECTURES = %w{
armeabi armeabi-v7a arm64-v8a
armeabi-v7a arm64-v8a
x86 x86_64
mips mips64
}
class AndroidNDKHomeNotFound < StandardError
@@ -40,21 +40,6 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
@params = params
end
def bin_gcc(command)
command = command.to_s
command = case arch
when /armeabi/ then 'arm-linux-androideabi-'
when /arm64-v8a/ then 'aarch64-linux-android-'
when /x86_64/ then 'x86_64-linux-android-'
when /x86/ then 'i686-linux-android-'
when /mips64/ then 'mips64el-linux-android-'
when /mips/ then 'mipsel-linux-android-'
end + command
gcc_toolchain_path.join('bin', command).to_s
end
def bin(command)
command = command.to_s
toolchain_path.join('bin', command).to_s
@@ -97,38 +82,7 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
end
def toolchain_path
@toolchain_path ||= case toolchain
when :gcc
gcc_toolchain_path
when :clang
home_path.join('toolchains', 'llvm' , 'prebuilt', host_platform)
end
end
def gcc_toolchain_path
if @gcc_toolchain_path === nil then
prefix = case arch
when /armeabi/ then 'arm-linux-androideabi-'
when /arm64-v8a/ then 'aarch64-linux-android-'
when /x86_64/ then 'x86_64-'
when /x86/ then 'x86-'
when /mips64/ then 'mips64el-linux-android-'
when /mips/ then 'mipsel-linux-android-'
end
test = case arch
when /armeabi/ then 'arm-linux-androideabi-*'
when /arm64-v8a/ then 'aarch64-linux-android-*'
when /x86_64/ then 'x86_64-*'
when /x86/ then 'x86-*'
when /mips64/ then 'mips64el-linux-android-*'
when /mips/ then 'mipsel-linux-android-*'
end
gcc_toolchain_version = Dir[home_path.join('toolchains', test)].map{|t| t.match(/-(\d+\.\d+)$/); $1.to_f }.max
@gcc_toolchain_path = home_path.join('toolchains', prefix + gcc_toolchain_version.to_s, 'prebuilt', host_platform)
end
@gcc_toolchain_path
@toolchain_path ||= home_path.join('toolchains', 'llvm' , 'prebuilt', host_platform)
end
def host_platform
@@ -189,15 +143,13 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
def cc
case toolchain
when :gcc then bin_gcc('gcc')
when :clang then bin('clang')
end
end
def ar
case toolchain
when :gcc then bin_gcc('ar')
when :clang then bin_gcc('ar')
when :clang then bin('llvm-ar')
end
end
@@ -206,38 +158,15 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
v = sdk_version
case toolchain
when :gcc
case arch
when /armeabi-v7a/ then flags += %W(-march=armv7-a)
when /armeabi/ then flags += %W(-march=armv5te)
when /arm64-v8a/ then flags += %W(-march=armv8-a)
when /x86_64/ then flags += %W(-march=x86-64)
when /x86/ then flags += %W(-march=i686)
when /mips64/ then flags += %W(-march=mips64r6)
when /mips/ then flags += %W(-march=mips32)
end
when :clang
case arch
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v})
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v})
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v})
when /x86_64/ then flags += %W(-target x86_64-none-linux-android#{v})
when /x86/ then flags += %W(-target i686-none-linux-android#{v})
when /mips64/ then flags += %W(-target mips64el-none-linux-android#{v})
when /mips/ then flags += %W(-target mipsel-none-linux-android#{v})
when /armeabi-v7a/ then flags += %W(-target armv7a-linux-androideabi#{v} -mfpu=#{armeabi_v7a_mfpu} -mfloat-abi=#{armeabi_v7a_mfloat_abi})
when /arm64-v8a/ then flags += %W(-target aarch64-linux-android#{v})
when /x86_64/ then flags += %W(-target x86_64-linux-android#{v})
when /x86/ then flags += %W(-target i686-linux-android#{v})
end
end
case arch
when /armeabi-v7a/ then flags += %W(-mfpu=#{armeabi_v7a_mfpu} -mfloat-abi=#{armeabi_v7a_mfloat_abi})
when /armeabi/ then flags += %W(-mtune=xscale -msoft-float)
when /arm64-v8a/ then flags += %W()
when /x86_64/ then flags += %W()
when /x86/ then flags += %W()
when /mips64/ then flags += %W(-fmessage-length=0)
when /mips/ then flags += %W(-fmessage-length=0)
end
flags
end
@@ -252,11 +181,6 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
flags += %W(-MMD -MP -D__android__ -DANDROID)
flags += ctarget
case toolchain
when :gcc
when :clang
flags += %W(-gcc-toolchain "#{gcc_toolchain_path}" -Wno-invalid-command-line-argument -Wno-unused-command-line-argument)
end
flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes)
flags
@@ -273,20 +197,12 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
v = sdk_version
case toolchain
when :gcc
case arch
when /armeabi-v7a/ then flags += %W(-Wl#{no_warn_mismatch})
end
when :clang
flags += %W(-gcc-toolchain "#{gcc_toolchain_path.to_s}")
case arch
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v} -Wl,--fix-cortex-a8#{no_warn_mismatch})
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v})
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v})
when /x86_64/ then flags += %W(-target x86_64-none-linux-android#{v})
when /x86/ then flags += %W(-target i686-none-linux-android#{v})
when /mips64/ then flags += %W(-target mips64el-none-linux-android#{v})
when /mips/ then flags += %W(-target mipsel-none-linux-android#{v})
end
end
flags += %W(-no-canonical-prefixes)