From cb662106253fc7eb08a90ca1a939b3c3f089be05 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 8 May 2014 11:14:41 -0500 Subject: [PATCH] toolchain: get rid of some bashisms On Ubuntu /bin/sh is symlinked to /bin/dash. The current toolchain.inc was doing some things that dash doesn't support. Make the shell callouts more conforming to the POSIX sh standard. BUG=None BRANCH=None TEST=Built rush. Change-Id: I26b6b82b8d6158c9029e8be9e7c088ca9e207f21 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/5701 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-on: https://chromium-review.googlesource.com/204400 Reviewed-by: Furquan Shaikh --- toolchain.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain.inc b/toolchain.inc index 1b47d19fb0..da056cf8d3 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -66,14 +66,14 @@ STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) INCLUDES_$(1) = $$(INCLUDES) -Isrc/arch/$(ARCHDIR-$(2))/include CFLAGS_$(1) = $$(CFLAGS_common) $$(INCLUDES_$(1)) $(CFLAGS_$(2)) -LIBGCC_FILE_NAME_$(1) = $(shell test -r `$(CC_$(2)) -print-libgcc-file-name` && \ +LIBGCC_FILE_NAME_$(1) = $(shell [ -r `$(CC_$(2)) -print-libgcc-file-name` ] && \ $(CC_$(2)) -print-libgcc-file-name) endef # initialize standard toolchain (CC,AS and others) for given stage # @1 : stage for which the toolchain is to be initialized init_standard_toolchain = \ - $(eval stage_caps := $(shell tr '[:lower:]' '[:upper:]' <<< $(1))) \ + $(eval stage_caps := $(shell printf "%s" $(1) | tr '[:lower:]' '[:upper:]' )) \ $(eval $(call set_stage_toolchain,$(stage_caps))) \ $(eval $(call create_class_compiler,$(1),$(ARCH-$(stage_caps)-y))) \ $(eval $(call set_stage_libgcc,$(1))) @@ -87,4 +87,4 @@ $(eval $(call create_class_compiler,arm64,aarch64)) $(eval $(call toolchain_to_dir)) -$(eval $(call init_stages)) \ No newline at end of file +$(eval $(call init_stages))