Skip to content

Commit c34322c

Browse files
committed
Build fix for RIOT target after the modifications of the build system (commit ddab1d8).
JerryScript-DCO-1.0-Signed-off-by: Robert Sipka [email protected]
1 parent ddab1d8 commit c34322c

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

targets/riot-stm32f4/Makefile.riot

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
TYPE ?= release
17-
INTERM ?= build/obj-riot-stm32f4
18-
OUTPUT ?= build/bin/$(TYPE).riotstm32f4
16+
BUILD_DIR ?= build/riotstm32f4/
1917
COPYTARGET ?= targets/riot-stm32f4/bin/
2018

2119
JERRYHEAP ?= 16
@@ -29,24 +27,24 @@ EXT_CFLAGS += -Wno-error=format=
2927
all: libjerry riot-jerry
3028

3129
libjerry:
32-
mkdir -p $(INTERM)
33-
mkdir -p $(OUTPUT)
30+
mkdir -p $(BUILD_DIR)
3431
mkdir -p $(COPYTARGET)
35-
cmake -B$(INTERM) -H./ \
36-
-DEXTERNAL_PORT_DIR=UNDEFINED \
32+
cmake -B$(BUILD_DIR) -H./ \
3733
-DENABLE_LTO=OFF \
38-
-DENABLE_VALGRIND=OFF \
39-
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
34+
-DFEATURE_VALGRIND=OFF \
35+
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain_external.cmake \
36+
-DJERRY_LIBC=OFF\
37+
-DJERRY_CMDLINE=OFF\
4038
-DCOMPILER_DEFAULT_LIBC=ON \
39+
-DENABLE_ALL_IN_ONE=OFF\
4140
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \
4241
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
4342
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
4443
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
45-
-DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP)
44+
-DMEM_HEAP_SIZE_KB=$(JERRYHEAP)
4645

47-
make -C $(INTERM) $(TYPE).external
48-
cp `cat $(INTERM)/$(TYPE).external/list` $(OUTPUT)/.
49-
cp $(OUTPUT)/lib$(TYPE).jerry-core.a $(COPYTARGET)/libjerrycore.a
46+
make -C$(BUILD_DIR) jerry-core
47+
cp $(BUILD_DIR)/lib/libjerry-core.a $(COPYTARGET)/libjerrycore.a
5048

5149
riot-jerry: libjerry
5250
make -f ./targets/riot-stm32f4/Makefile
@@ -55,7 +53,6 @@ flash: libjerry
5553
make -f ./targets/riot-stm32f4/Makefile flash
5654

5755
clean:
58-
rm -rf $(INTERM)
5956
rm -rf $(OUTPUT)
6057
rm -rf $(COPYTARGET)
6158
make -f ./targets/riot-stm32f4/Makefile clean

0 commit comments

Comments
 (0)