Skip to content
Snippets Groups Projects
Commit 88fb7e80 authored by Cyril Moineau's avatar Cyril Moineau
Browse files

Now MakeFile use a path relative to the MakeFile rather than PWD to use Docker...

Now MakeFile use a path relative to the MakeFile rather than PWD to use Docker commands.\nFix #36
parent 5a410b66
No related branches found
No related tags found
1 merge request!29Fix Docker with makefile
......@@ -30,14 +30,16 @@ TARGET := ${BINDIR}/aidge_STM32F7.elf
FLASH_LD := STM32F746ZGTx_FLASH.ld
HAL_HEADER_FILE := stm32f7xx_hal.h
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
MAKEFILE_DIR := $(dir $(MAKEFILE_PATH))
COMMON_FLAGS := -DHAL_HEADER="<${HAL_HEADER_FILE}>" -DNDEBUG -Ofast -Wall -Wno-unused-variable -specs=nano.specs -c -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16 -DUSE_HAL_DRIVER -DSTM32F746xx -DARM_MATH_CM7 -MMD
COMMON_FLAGS := -DHAL_HEADER="<${HAL_HEADER_FILE}>" -DNDEBUG -Ofast -Wall -Wno-unused-variable -specs=nano.specs -c -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16 -DUSE_HAL_DRIVER -DSTM32F746xx -DARM_MATH_CM7 -MMD
INCLUDE_DIRS := -I./Inc -I./Drivers/CMSIS/Include -I./Drivers/CMSIS/Device/ST/STM32F7xx/Include -I./Drivers/STM32F7xx_HAL_Driver/Inc -I./Drivers/STM32F7xx_HAL_Driver/Inc/Legacy -I. -I./dnn/include
LINK_FLAGS := $(LINK_FLAGS) -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16 -T${FLASH_LD} -lc -lm -lnosys -specs=nano.specs -flto -Wl,--print-memory-usage -u _printf_float
PREFIX := arm-none-eabi
CC := $(PREFIX)-gcc
CC_FLAGS := ${COMMON_FLAGS} -std=gnu11
CC_FLAGS := ${COMMON_FLAGS} -std=gnu11
CC_SRCS := $(shell find -name '*.c')
CC_OBJS := $(patsubst %.c,$(OBJDIR)/%.c.o,$(CC_SRCS))
DEPENDENCIES := $(patsubst %.c.o,%.c.d,$(CC_OBJS))
......@@ -60,7 +62,7 @@ all: help
build: ${CC_OBJS} ${CXX_OBJS} ${ASM_OBJS}
@mkdir -p $(dir ${TARGET})
@chmod -R 777 $(OBJDIR)
${CC} ${CC_OBJS} ${CXX_OBJS} ${ASM_OBJS} ${LINK_FLAGS} -o ${TARGET}
${CC} ${CC_OBJS} ${CXX_OBJS} ${ASM_OBJS} ${LINK_FLAGS} -o ${TARGET}
@chmod -R 777 $(BINDIR)
${OBJDIR}/%.c.o: %.c
......@@ -75,7 +77,7 @@ ${OBJDIR}/%.cpp.o: %.cpp
${CXX} ${CXX_FLAGS} ${INCLUDE_DIRS} -o $@ $<
@chmod -R 777 $(OBJDIR)
${OBJDIR}/%.s.o: %.s
${OBJDIR}/%.s.o: %.s
@mkdir -p $(dir $@)
@chmod -R 777 $(OBJDIR)
${ASM} ${ASM_FLAGS} -o $@ $<
......@@ -106,7 +108,10 @@ build_image_docker:
.PHONY: build_docker
build_export_docker:
@docker run --rm --name ${BOARD}_compiling -v "${PWD}":/usr/src/export -w /usr/src/export ${IMAGE} make build
@docker run --rm --name ${BOARD}_compiling -v "${MAKEFILE_DIR}":/usr/src/export -w /usr/src/export ${IMAGE} make build
clean_export_docker:
@docker run --rm --name ${BOARD}_compiling -v "${MAKEFILE_DIR}":/usr/src/export -w /usr/src/export ${IMAGE} make clean
-include $(DEPENDENCIES)
......@@ -31,15 +31,17 @@ TARGET := ${BINDIR}/aidge_stm32.elf
FLASH_LD := STM32H743ZITx_FLASH.ld
HAL_HEADER_FILE := stm32h7xx_hal.h
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
MAKEFILE_DIR := $(dir $(MAKEFILE_PATH))
COMMON_FLAGS := -DHAL_HEADER="<${HAL_HEADER_FILE}>" -DNDEBUG -Ofast -Wall -Wno-unused-variable -specs=nano.specs -c -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16 -DUSE_HAL_DRIVER -DSTM32H743xx -DARM_MATH_CM7 -MMD
COMMON_FLAGS := -DHAL_HEADER="<${HAL_HEADER_FILE}>" -DNDEBUG -Ofast -Wall -Wno-unused-variable -specs=nano.specs -c -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16 -DUSE_HAL_DRIVER -DSTM32H743xx -DARM_MATH_CM7 -MMD
INCLUDE_DIRS := -IInc -I./dnn -I./dnn/include -I./Drivers/STM32H7xx_HAL_Driver/Inc -I./Drivers/STM32H7xx_HAL_Driver/Inc/Legacy -I./Drivers/CMSIS/Device/ST/STM32H7xx/Include -I./Drivers/CMSIS/Include -I.
LINK_FLAGS := $(LINK_FLAGS) -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16 -T${FLASH_LD} -lc -lm -lnosys -specs=nano.specs -flto -Wl,--print-memory-usage -u _printf_float
PREFIX := arm-none-eabi
CC := $(PREFIX)-gcc
CC_FLAGS := ${COMMON_FLAGS} -std=gnu11
CC_FLAGS := ${COMMON_FLAGS} -std=gnu11
CC_SRCS := $(shell find -name '*.c')
CC_OBJS := $(patsubst %.c,$(OBJDIR)/%.c.o,$(CC_SRCS))
DEPENDENCIES := $(patsubst %.c.o,%.c.d,$(CC_OBJS))
......@@ -62,7 +64,7 @@ all: help
build: ${CC_OBJS} ${CXX_OBJS} ${ASM_OBJS}
@mkdir -p $(dir ${TARGET})
@chmod -R 777 $(BINDIR)
${CC} ${CC_OBJS} ${CXX_OBJS} ${ASM_OBJS} ${LINK_FLAGS} -o ${TARGET}
${CC} ${CC_OBJS} ${CXX_OBJS} ${ASM_OBJS} ${LINK_FLAGS} -o ${TARGET}
@chmod -R 777 $(BINDIR)
${OBJDIR}/%.c.o: %.c
......@@ -77,7 +79,7 @@ ${OBJDIR}/%.cpp.o: %.cpp
${CXX} ${CXX_FLAGS} ${INCLUDE_DIRS} -o $@ $<
@chmod -R 777 $(OBJDIR)
${OBJDIR}/%.s.o: %.s
${OBJDIR}/%.s.o: %.s
@mkdir -p $(dir $@)
@chmod -R 777 $(OBJDIR)
${ASM} ${ASM_FLAGS} -o $@ $<
......@@ -103,10 +105,10 @@ build_image_docker:
.PHONY: build_export_docker clean_export_docker
build_export_docker:
@docker run --rm --name ${BOARD}_compiling -v "${PWD}":/usr/src/export -w /usr/src/export ${IMAGE} make build
@docker run --rm --name ${BOARD}_compiling -v "${MAKEFILE_DIR}":/usr/src/export -w /usr/src/export ${IMAGE} make build
clean_export_docker:
@docker run --rm --name ${BOARD}_compiling -v "${PWD}":/usr/src/export -w /usr/src/export ${IMAGE} make clean
@docker run --rm --name ${BOARD}_compiling -v "${MAKEFILE_DIR}":/usr/src/export -w /usr/src/export ${IMAGE} make clean
-include $(DEPENDENCIES)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment