Merge pull request #1103

b8fb9d1 Fix test for 'ARM_ID' as caught by @radfish in #1088 (NanoAkron)
This commit is contained in:
Riccardo Spagni 2016-09-26 17:31:27 +02:00
commit 179d89f111
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 3 deletions

View File

@ -65,10 +65,10 @@ else()
set(ARCH_ID "${ARCH}") set(ARCH_ID "${ARCH}")
endif() endif()
string(TOLOWER "${ARCH_ID}" ARM_ID) string(TOLOWER "${ARCH_ID}" ARM_ID)
string(SUBSTRING "${ARCH_ID}" 0 3 ARM_TEST) string(SUBSTRING "${ARM_ID}" 0 3 ARM_TEST)
if (ARM_TEST STREQUAL "arm") if (ARM_TEST STREQUAL "arm")
set(ARM 1) set(ARM 1)
string(SUBSTRING "${ARCH_ID}" 0 5 ARM_TEST) string(SUBSTRING "${ARM_ID}" 0 5 ARM_TEST)
if (ARM_TEST STREQUAL "armv6") if (ARM_TEST STREQUAL "armv6")
set(ARM6 1) set(ARM6 1)
endif() endif()
@ -77,7 +77,7 @@ if (ARM_TEST STREQUAL "arm")
endif() endif()
endif() endif()
if (ARCH_ID STREQUAL "aarch64") if (ARM_ID STREQUAL "aarch64")
set(ARM 1) set(ARM 1)
set(ARM8 1) set(ARM8 1)
endif() endif()