diff options
| author | Jimmy Huang <jimmy.huang@linux.intel.com> | 2018-02-07 14:18:04 -0800 |
|---|---|---|
| committer | Geoff Gustafson <geoff@linux.intel.com> | 2018-02-07 14:18:04 -0800 |
| commit | 9f1fcc2148db337f5e182ac1583d248dcbc2352b (patch) | |
| tree | 8eb65487eb756e1d6956f991938e6219fb034eea | |
| parent | 7977974a7f1a8df93a2d32cfaa1188ce8ecd7274 (diff) | |
[jerryscript] Rebase to latest JerryScript (#1818)
JerryScript updated cmake on how to build with external toolchains;
this patch will fix the breakage.
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>
| -rw-r--r-- | cmake/jerry.cmake | 6 | ||||
| m--------- | deps/jerryscript | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/jerry.cmake b/cmake/jerry.cmake index 2fb219f..a504c4e 100644 --- a/cmake/jerry.cmake +++ b/cmake/jerry.cmake @@ -30,11 +30,11 @@ endif() set(CMAKE_ARGS -B${JERRY_LIBDIR} -DCMAKE_BUILD_TYPE=MinSizeRel - -DCMAKE_TOOLCHAIN_FILE=${JERRY_BASE}/cmake/toolchain_external.cmake + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_COMPILER_WORKS=TRUE + -DCMAKE_SYSTEM_NAME=Zephyr -DENABLE_ALL_IN_ONE=${ALL_IN_ONE} -DENABLE_LTO=OFF - -DEXTERNAL_CMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DEXTERNAL_CMAKE_C_COMPILER_ID=GNU -DEXTERNAL_COMPILE_FLAGS=${external_project_cflags} -DFEATURE_ERROR_MESSAGES=ON -DFEATURE_INIT_FINI=ON diff --git a/deps/jerryscript b/deps/jerryscript -Subproject 9f0cf9ef1c95d6444b4be4f1e68ea7263620b5b +Subproject c429530d02347431856fa0bfa1c161c6f3b6953 |