diff options
| author | Akos Kiss <akiss@inf.u-szeged.hu> | 2016-08-07 19:56:35 +0200 |
|---|---|---|
| committer | Akos Kiss <akiss@inf.u-szeged.hu> | 2016-08-08 13:42:59 +0200 |
| commit | d5eb2f0be1b06827b1aad7d0d6d36bd17c68dbfc (patch) | |
| tree | 2f210185edc959276e376293c82f689b997e5b62 /jerry-libc | |
| parent | 2836f49eec34b49f16eef936b906f8a68377e9af (diff) | |
Let the build script use a default for toolchain
The `cmake` directory already contains several toolchain files for
various platforms (operating system + architecture). However,
`tools/build.py` does not define a toolchain file for cmake unless
explicitly specified. This patch changes the script to look into
the `cmake` directory for a file named
`toolchain_$(os)_$(arch).cmake` and, if found, pass that to cmake
by default.
OS and arch are determined by `os.uname()`. As Linux on Raspberry
Pi identifies itself as "armv7l", the legacy "armv7l-hf" arch name
is shortened to "armv7l". This way, building jerry on RPi
(natively, not cross) becomes possible by simply running
`tools/build.py` without any extra options.
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
Diffstat (limited to 'jerry-libc')
| -rw-r--r-- | jerry-libc/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jerry-libc/CMakeLists.txt b/jerry-libc/CMakeLists.txt index 3b7e2b8b..a634cb40 100644 --- a/jerry-libc/CMakeLists.txt +++ b/jerry-libc/CMakeLists.txt @@ -20,7 +20,7 @@ project (${JERRY_LIBC_NAME} C ASM) # Architecture-specific configuration if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") set(DEFINES_LIBC ${DEFINES_LIBC} __TARGET_HOST_x64) -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l-hf") +elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") set(DEFINES_LIBC ${DEFINES_LIBC} __TARGET_HOST_ARMv7 __TARGET_HOST_ARMv7_HARD_FLOAT) elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l-el") set(DEFINES_LIBC ${DEFINES_LIBC} __TARGET_HOST_ARMv7 __TARGET_HOST_ARMv7_SOFT_FLOAT) |