Skip to content

Fixed regex order falling early in arch cases, causing x86_64 and arm… #3210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2016
Merged

Fixed regex order falling early in arch cases, causing x86_64 and arm… #3210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions tasks/toolchains/android.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,30 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter
command = command.to_s

command = case arch
when /armeabi/, /armeabi-v7a/ then 'arm-linux-androideabi-'
when /arm64-v8a/ then 'aarch64-linux-android-'
when /x86/ then 'i686-linux-android-'
when /x86_64/ then 'x86_64-linux-android-'
when /mips/ then 'mipsel-linux-android-'
when /mips64/ then 'mips64el-linux-android-'
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

prefix = case arch
when /armeabi/, /armeabi-v7a/ then 'arm-linux-androideabi-'
when /arm64-v8a/ then 'aarch64-linux-android-'
when /x86/ then 'x86-'
when /x86_64/ then 'x86_64-'
when /mips/ then 'mipsel-linux-android-'
when /mips64/ then 'mips64el-linux-android-'
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/, /armeabi-v7a/ then 'arm-linux-androideabi-*'
when /arm64-v8a/ then 'aarch64-linux-android-*'
when /x86/ then 'x86-*'
when /x86_64/ then 'x86_64-*'
when /mips/ then 'mipsel-linux-android-*'
when /mips64/ then 'mips64el-linux-android-*'
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
Expand Down Expand Up @@ -138,12 +138,12 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter
def sysroot
@sysroot ||= home_path.join('platforms', platform,
case arch
when /armeabi/, /armeabi-v7a/ then 'arch-arm'
when /arm64-v8a/ then 'arch-arm64'
when /x86/ then 'arch-x86'
when /x86_64/ then 'arch-x86_64'
when /mips/ then 'arch-mips'
when /mips64/ then 'arch-mips64'
when /armeabi/ then 'arch-arm'
when /arm64-v8a/ then 'arch-arm64'
when /x86_64/ then 'arch-x86_64'
when /x86/ then 'arch-x86'
when /mips64/ then 'arch-mips64'
when /mips/ then 'arch-mips'
end
).to_s
end
Expand Down Expand Up @@ -197,13 +197,13 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter
when :clang
flags += %W(-gcc-toolchain #{toolchain_path.to_s})
case arch
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi)
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi)
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi)
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android)
when /x86/ then flags += %W(-target i686-none-linux-android)
when /x86_64/ then flags += %W(-target x86_64-none-linux-android)
when /mips/ then flags += %W(-target mipsel-none-linux-android)
when /x86/ then flags += %W(-target i686-none-linux-android)
when /mips64/ then flags += %W(-target mips64el-none-linux-android)
when /mips/ then flags += %W(-target mipsel-none-linux-android)
end
end

Expand Down