updated workflow

diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 230c479e982bb578b1c473cd70599658c2459474..7e787a70d0ec0522f25a1bb6acf09dfc7196d068 100644 (file)
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ "main" ]
 
+env:
+  RUN_IN_GITHUB_ACTION: TRUE
+
 jobs:
   build:
 

diff --git a/numworks_port/Makefile b/numworks_port/Makefile
index 44faedeac6728a815dc16eba881eaa6f96d756f0..87ab9ad22289e593e9ec68392b7f3b600d39c999 100644 (file)
--- a/numworks_port/Makefile
+++ b/numworks_port/Makefile
@@ -9,14 +9,19 @@ LD_SCRIPT = $(SRC_DIR)/linker.ld
 MCU_SPEC  = cortex-m7
 
 # Toolchain definitions (ARM bare metal defaults)
-TOOLCHAIN = /usr
-CP = $(TOOLCHAIN)/bin/arm-none-eabi-g++
-CC = $(TOOLCHAIN)/bin/arm-none-eabi-gcc
-AS = $(TOOLCHAIN)/bin/arm-none-eabi-as
-LD = $(TOOLCHAIN)/bin/arm-none-eabi-ld
-OC = $(TOOLCHAIN)/bin/arm-none-eabi-objcopy
-OD = $(TOOLCHAIN)/bin/arm-none-eabi-objdump
-OS = $(TOOLCHAIN)/bin/arm-none-eabi-size
+ifeq ($(RUN_IN_GITHUB_ACTION),"TRUE")
+TOOLCHAIN = $(ARM_NONE_EABI_GCC_PATH)
+else
+TOOLCHAIN = /usr/bin
+endif
+
+CP = $(TOOLCHAIN)/arm-none-eabi-g++
+CC = $(TOOLCHAIN)/arm-none-eabi-gcc
+AS = $(TOOLCHAIN)/arm-none-eabi-as
+LD = $(TOOLCHAIN)/arm-none-eabi-ld
+OC = $(TOOLCHAIN)/arm-none-eabi-objcopy
+OD = $(TOOLCHAIN)/arm-none-eabi-objdump
+OS = $(TOOLCHAIN)/arm-none-eabi-size
 
 # Assembly directives.
 ASFLAGS += -c