Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-17 21:35:37 +03:00
Code Issues Wiki Activity

[TOOLS] Make sure settings compiler uses GCC from installed toolchain

Browse source
This commit is contained in:
Konstantin (DigitalEntity) Sharlaimov 2019-07-08 22:38:45 +02:00
parent dcfc1d4036
commit cde7eb6b94
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -323,16 +323,16 @@ $(GENERATED_SETTINGS): $(SETTINGS_GENERATOR) $(SETTINGS_FILE) $(STAMP)
CFLAGS += -I$(TARGET_OBJ_DIR)
$(STAMP): .FORCE
$(V1) CFLAGS="$(CFLAGS)" TARGET=$(TARGET) ruby $(BUILD_STAMP) $(SETTINGS_FILE) $(STAMP)
$(V1) CPP_PATH="$(ARM_SDK_DIR)/bin" CFLAGS="$(CFLAGS)" TARGET=$(TARGET) ruby $(BUILD_STAMP) $(SETTINGS_FILE) $(STAMP)
# Use a pattern rule, since they're different than normal rules.
# See https://www.gnu.org/software/make/manual/make.html#Pattern-Examples
%generated.h %generated.c:
$(V1) echo "settings.yaml -> settings_generated.h, settings_generated.c" "$(STDOUT)"
$(V1) CFLAGS="$(CFLAGS)" TARGET=$(TARGET) ruby $(SETTINGS_GENERATOR) . $(SETTINGS_FILE) -o $(TARGET_OBJ_DIR)
$(V1) CPP_PATH="$(ARM_SDK_DIR)/bin" CFLAGS="$(CFLAGS)" TARGET=$(TARGET) ruby $(SETTINGS_GENERATOR) . $(SETTINGS_FILE) -o $(TARGET_OBJ_DIR)
settings-json:
$(V0) CFLAGS="$(CFLAGS)" TARGET=$(TARGET) ruby $(SETTINGS_GENERATOR) . $(SETTINGS_FILE) --json settings.json
$(V0) CPP_PATH="$(ARM_SDK_DIR)/bin" CFLAGS="$(CFLAGS)" TARGET=$(TARGET) ruby $(SETTINGS_GENERATOR) . $(SETTINGS_FILE) --json settings.json
clean-settings:
$(V1) $(RM) $(GENERATED_SETTINGS)

2
src/utils/compiler.rb
View file

@ -34,7 +34,7 @@ class Compiler
# Look for the compiler in PATH manually, since there
# are some issues with the built-in search by spawn()
# on Windows if PATH contains spaces.
dirs = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
dirs = (ENV["CPP_PATH"] || "").split(File::PATH_SEPARATOR)
bin = "arm-none-eabi-g++"
dirs.each do |dir|
p = File.join(dir, bin)