Build fix for RIOT target after the modifications of the build system (commit ddab1d8).

JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
This commit is contained in:
Robert Sipka
2016-07-28 14:15:11 +02:00
parent 37f9b475c0
commit e6fefd42bd
+12 -15
View File
@@ -13,10 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TYPE ?= release BUILD_DIR ?= build/riotstm32f4
INTERM ?= build/obj-riot-stm32f4 COPYTARGET ?= targets/riot-stm32f4/bin
OUTPUT ?= build/bin/$(TYPE).riotstm32f4
COPYTARGET ?= targets/riot-stm32f4/bin/
JERRYHEAP ?= 16 JERRYHEAP ?= 16
@@ -29,24 +27,24 @@ EXT_CFLAGS += -Wno-error=format=
all: libjerry riot-jerry all: libjerry riot-jerry
libjerry: libjerry:
mkdir -p $(INTERM) mkdir -p $(BUILD_DIR)
mkdir -p $(OUTPUT)
mkdir -p $(COPYTARGET) mkdir -p $(COPYTARGET)
cmake -B$(INTERM) -H./ \ cmake -B$(BUILD_DIR) -H./ \
-DEXTERNAL_PORT_DIR=UNDEFINED \
-DENABLE_LTO=OFF \ -DENABLE_LTO=OFF \
-DENABLE_VALGRIND=OFF \ -DFEATURE_VALGRIND=OFF \
-DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \ -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain_external.cmake \
-DJERRY_LIBC=OFF \
-DJERRY_CMDLINE=OFF \
-DCOMPILER_DEFAULT_LIBC=ON \ -DCOMPILER_DEFAULT_LIBC=ON \
-DENABLE_ALL_IN_ONE=OFF \
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \ -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \
-DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \ -DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
-DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \ -DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
-DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP) -DMEM_HEAP_SIZE_KB=$(JERRYHEAP)
make -C $(INTERM) $(TYPE).external make -C$(BUILD_DIR) jerry-core
cp `cat $(INTERM)/$(TYPE).external/list` $(OUTPUT)/. cp $(BUILD_DIR)/lib/libjerry-core.a $(COPYTARGET)/libjerrycore.a
cp $(OUTPUT)/lib$(TYPE).jerry-core.a $(COPYTARGET)/libjerrycore.a
riot-jerry: libjerry riot-jerry: libjerry
make -f ./targets/riot-stm32f4/Makefile make -f ./targets/riot-stm32f4/Makefile
@@ -55,7 +53,6 @@ flash: libjerry
make -f ./targets/riot-stm32f4/Makefile flash make -f ./targets/riot-stm32f4/Makefile flash
clean: clean:
rm -rf $(INTERM)
rm -rf $(OUTPUT) rm -rf $(OUTPUT)
rm -rf $(COPYTARGET) rm -rf $(COPYTARGET)
make -f ./targets/riot-stm32f4/Makefile clean make -f ./targets/riot-stm32f4/Makefile clean