summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-03-08 12:32:40 -0700
committerMartin Roth <martinroth@google.com>2016-03-11 18:48:06 +0100
commit6116f369e98afef29e284c6148414d8c5832689d (patch)
treed3cfa494c9fac42d11437fd2cb2fe3d02a4ad76d
parent00e49aed52cbc32cf8cdab8dbf1eeb96e27ea336 (diff)
downloadcoreboot-6116f369e98afef29e284c6148414d8c5832689d.tar.xz
codebase: Change makefile $(shell pwd) commands to $(CURDIR)
- Change the makefile command $(shell pwd) to $(CURDIR) to find the current directory without going out to the shell. Change-Id: I4890eba6129630acd2883b92de77308d39949443 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/13967 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--payloads/bayou/Makefile2
-rw-r--r--payloads/bayou/util/pbuilder/lzma/Makefile14
-rw-r--r--payloads/coreinfo/Makefile8
-rw-r--r--payloads/external/Memtest86Plus/Makefile.inc2
-rw-r--r--payloads/libpayload/Makefile.inc8
-rw-r--r--util/bimgtool/Makefile2
-rw-r--r--util/viatool/Makefile2
7 files changed, 19 insertions, 19 deletions
diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile
index 454e8bb2db..7a4b08b484 100644
--- a/payloads/bayou/Makefile
+++ b/payloads/bayou/Makefile
@@ -20,7 +20,7 @@ CONFIG_BUILTIN_LAR=y
PBUILDER_CONFIG=bayou.xml
BUILTIN_LAR=builtin.lar
-export src := $(shell pwd)
+export src := $(CURDIR)
export obj := $(src)/build
LIBPAYLOAD_DIR := $(obj)/libpayload
diff --git a/payloads/bayou/util/pbuilder/lzma/Makefile b/payloads/bayou/util/pbuilder/lzma/Makefile
index 5004fd8f98..02c0b34ec1 100644
--- a/payloads/bayou/util/pbuilder/lzma/Makefile
+++ b/payloads/bayou/util/pbuilder/lzma/Makefile
@@ -30,29 +30,29 @@ $(obj)/util/lzma/:
$(Q)mkdir -p $(obj)/util/lzma/
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Compress/LZMA/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Compress/LZ/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Compress/RangeCoder/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Decompress/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Common/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/Common/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/%.cc
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index f4a897cac0..ab25bf3dc3 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -14,7 +14,7 @@
## GNU General Public License for more details.
##
-src := $(shell pwd)
+src := $(CURDIR)
srctree := $(src)
srck := $(src)/../../util/kconfig
coreinfo_obj := $(src)/build
@@ -88,18 +88,18 @@ include $(src)/.config
real-all: $(TARGET)
$(TARGET): $(src)/.config $(coreinfo_obj)/config.h $(OBJS) libpayload
- printf " LPCC $(subst $(shell pwd)/,,$(@)) (LINK)\n"
+ printf " LPCC $(subst $(CURDIR)/,,$(@)) (LINK)\n"
$(LPCC) -o $@ $(OBJS)
$(OBJCOPY) --only-keep-debug $@ $(TARGET).debug
$(OBJCOPY) --strip-debug $@
$(OBJCOPY) --add-gnu-debuglink=$(TARGET).debug $@
$(coreinfo_obj)/%.S.o: $(src)/%.S libpayload
- printf " LPAS $(subst $(shell pwd)/,,$(@))\n"
+ printf " LPAS $(subst $(CURDIR)/,,$(@))\n"
$(LPAS) -o $@ $<
$(coreinfo_obj)/%.o: $(src)/%.c libpayload
- printf " LPCC $(subst $(shell pwd)/,,$(@))\n"
+ printf " LPCC $(subst $(CURDIR)/,,$(@))\n"
$(LPCC) $(CFLAGS) -c -o $@ $<
else
diff --git a/payloads/external/Memtest86Plus/Makefile.inc b/payloads/external/Memtest86Plus/Makefile.inc
index ceb1f5ceae..ee79032313 100644
--- a/payloads/external/Memtest86Plus/Makefile.inc
+++ b/payloads/external/Memtest86Plus/Makefile.inc
@@ -14,7 +14,7 @@
##
project_name=Memtest86+
-project_dir=$(shell pwd)/memtest86plus
+project_dir=$(CURDIR)/memtest86plus
project_git_repo=https://review.coreboot.org/memtest86plus
all: build
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
index c10718f2fe..a449f7abcf 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.inc
@@ -75,22 +75,22 @@ lib: $$(library-targets) $(obj)/head.o
extract_nth=$(word $(1), $(subst |, ,$(2)))
#######################################################################
-# Add handler for special include files
+# Add handler for special include files
$(call add-special-class,includes)
includes-handler= \
$(if $(wildcard $(1)$(call extract_nth,1,$(2))), \
$(eval includes += $(1)$(2)))
$(obj)/libpayload.a: $(foreach class,$(libraries),$$($(class)-objs))
- printf " AR $(subst $(shell pwd)/,,$(@))\n"
+ printf " AR $(subst $(CURDIR)/,,$(@))\n"
$(AR) rc $@ $^
$(obj)/%.a: $$(%-objs)
- printf " AR $(subst $(shell pwd)/,,$(@))\n"
+ printf " AR $(subst $(CURDIR)/,,$(@))\n"
$(AR) rc $@ $^
$(obj)/head.o: $(obj)/arch/$(ARCHDIR-y)/head.head.o.o
- printf " CP $(subst $(shell pwd)/,,$(@))\n"
+ printf " CP $(subst $(CURDIR)/,,$(@))\n"
cp $^ $@
install: real-target
diff --git a/util/bimgtool/Makefile b/util/bimgtool/Makefile
index ca4a9d9776..05ddf7d757 100644
--- a/util/bimgtool/Makefile
+++ b/util/bimgtool/Makefile
@@ -1,4 +1,4 @@
-obj ?= $(shell pwd)
+obj ?= $(CURDIR)
HOSTCC ?= gcc
CFLAGS ?= -g
diff --git a/util/viatool/Makefile b/util/viatool/Makefile
index 4d9d0d0ea9..365497a308 100644
--- a/util/viatool/Makefile
+++ b/util/viatool/Makefile
@@ -21,7 +21,7 @@ PROGRAM = viatool
CC ?= gcc
INSTALL ?= /usr/bin/install
PREFIX ?= /usr/local
-CFLAGS ?= -O2 -g -Wall -W -I$(shell pwd)
+CFLAGS ?= -O2 -g -Wall -W -I$(CURDIR)
LDFLAGS += -lpci -lz
SRCS = viatool.c \