From 6936fcbd60d4c76d83117181d98a87ec733e482f Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 11 Sep 2012 19:48:22 +0000 Subject: [PATCH] Minor build system tweaks for platform compatibility. --- LUFA/Build/lufa_build.mk | 2 +- LUFA/Build/lufa_hid.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/LUFA/Build/lufa_build.mk b/LUFA/Build/lufa_build.mk index 88430b21fe..3dc555cf94 100644 --- a/LUFA/Build/lufa_build.mk +++ b/LUFA/Build/lufa_build.mk @@ -308,7 +308,7 @@ $(OBJDIR)/%.o: %.S $(MAKEFILE_LIST) # Creates an assembly listing file from an input project ELF file, containing interleaved assembly and source data %.lss: %.elf @echo $(MSG_OBJDMP_CMD) Extracting LSS file data from \"$<\" - $(CROSS)-objdump -h -S -z $< > $@ + $(CROSS)-objdump -h -d -S -z $< > $@ # Creates a symbol file listing the loadable and discarded symbols from an input project ELF file %.sym: %.elf diff --git a/LUFA/Build/lufa_hid.mk b/LUFA/Build/lufa_hid.mk index f0e4f45de0..867c5dedca 100644 --- a/LUFA/Build/lufa_hid.mk +++ b/LUFA/Build/lufa_hid.mk @@ -50,6 +50,8 @@ LUFA_BUILD_PROVIDED_MACROS += # # ----------------------------------------------------------------------------- +SHELL = /bin/sh + ERROR_IF_UNSET ?= $(if $(filter undefined, $(origin $(strip $(1)))), $(error Makefile $(strip $(1)) value not set)) ERROR_IF_EMPTY ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $(1)) option cannot be blank)) ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N))