From cde7eb6b94619f59ba541f5940b080357830384c Mon Sep 17 00:00:00 2001 From: "Konstantin (DigitalEntity) Sharlaimov" Date: Mon, 8 Jul 2019 22:38:45 +0200 Subject: [PATCH] [TOOLS] Make sure settings compiler uses GCC from installed toolchain --- Makefile | 6 +++--- src/utils/compiler.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f4fc6ba476..679ec30b41 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/src/utils/compiler.rb b/src/utils/compiler.rb index 3a8f4d9919..768ce8b977 100644 --- a/src/utils/compiler.rb +++ b/src/utils/compiler.rb @@ -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)