diff options
| author | Karl Palsson <karlp@tweak.net.au> | 2017-11-19 23:52:05 +0300 |
|---|---|---|
| committer | Karl Palsson <karlp@tweak.net.au> | 2017-11-19 23:52:05 +0300 |
| commit | 953bf531ea1c0b36a5b32b05ede8c6c77e480009 (patch) | |
| tree | 7344e9cbfe6f378f26ca9db01756eb78a9ec2810 /mk | |
| parent | 19d296dd7b69383e11a1dc08c8d81356ad63cb47 (diff) | |
awk->gawk: Make the gawk dependency explicit
Until https://github.com/libopencm3/libopencm3/issues/732 has been
fixed, it's not enough to just have it in the README that you need GNU
awk. Explicitly use the "gawk" command name. This exists on (sane)
systems that have gawk as awk, and for systems that use mawk as default,
the gawk name should also exist.
This should make it significantly easier to diagnost the cause of build
problems.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/genlink-config.mk | 10 | ||||
| -rw-r--r-- | mk/genlink-rules.mk | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/genlink-config.mk b/mk/genlink-config.mk index a08636ef..ae480513 100644 --- a/mk/genlink-config.mk +++ b/mk/genlink-config.mk @@ -24,11 +24,11 @@ endif LDSCRIPT = generated.$(DEVICE).ld DEVICES_DATA = $(OPENCM3_DIR)/ld/devices.data -genlink_family :=$(shell awk -v PAT="$(DEVICE)" -v MODE="FAMILY" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_subfamily :=$(shell awk -v PAT="$(DEVICE)" -v MODE="SUBFAMILY" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_cpu :=$(shell awk -v PAT="$(DEVICE)" -v MODE="CPU" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_fpu :=$(shell awk -v PAT="$(DEVICE)" -v MODE="FPU" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) -genlink_cppflags :=$(shell awk -v PAT="$(DEVICE)" -v MODE="CPPFLAGS" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) +genlink_family :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="FAMILY" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) +genlink_subfamily :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="SUBFAMILY" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) +genlink_cpu :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="CPU" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) +genlink_fpu :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="FPU" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) +genlink_cppflags :=$(shell gawk -v PAT="$(DEVICE)" -v MODE="CPPFLAGS" -f $(OPENCM3_DIR)/scripts/genlink.awk $(DEVICES_DATA)) CPPFLAGS += $(genlink_cppflags) diff --git a/mk/genlink-rules.mk b/mk/genlink-rules.mk index efd0f68c..8979b5cb 100644 --- a/mk/genlink-rules.mk +++ b/mk/genlink-rules.mk @@ -19,4 +19,4 @@ $(LDSCRIPT):$(OPENCM3_DIR)/ld/linker.ld.S @printf " GENLNK $(DEVICE)\n" - $(Q)$(CPP) $(ARCH_FLAGS) $(shell awk -v PAT="$(DEVICE)" -v MODE="DEFS" -f $(OPENCM3_DIR)/scripts/genlink.awk $(OPENCM3_DIR)/ld/devices.data 2>/dev/null) -P -E $< > $@ + $(Q)$(CPP) $(ARCH_FLAGS) $(shell gawk -v PAT="$(DEVICE)" -v MODE="DEFS" -f $(OPENCM3_DIR)/scripts/genlink.awk $(OPENCM3_DIR)/ld/devices.data 2>/dev/null) -P -E $< > $@ |