diff options
| author | Eduardo Habkost | 2016-06-06 17:53:54 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-07 16:00:02 +0200 |
| commit | d5aebef884cabf197d51d2066a5beee8d0c721d4 (patch) | |
| tree | b4320b8e891dcfb10bca1467cbee07d6772707e3 | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160607' into... (diff) | |
| download | qemu-d5aebef884cabf197d51d2066a5beee8d0c721d4.tar.gz qemu-d5aebef884cabf197d51d2066a5beee8d0c721d4.tar.xz qemu-d5aebef884cabf197d51d2066a5beee8d0c721d4.zip | |
docker: Don't use eval trick on Makefile
The eval trick for defining DOCKER_SRC_COPY doesn't do anything
useful, as DOCKER_SRC_COPY is immediately expanded just after it
is defined, and CUR_TIME is already defined using ":=". Simply
define it using ":=" so it is evaluated only once.
The eval trick was also triggering an weird error on Travis builds:
qemu/tests/docker/Makefile.include:34: *** unterminated variable reference. Stop.
The issue is not easily reproducible (maybe it's a bug in some
versions of Make), but it is avoided if removing the eval trick.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tests/docker/Makefile.include | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 2fd2ca3057..134dc6fff4 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -28,8 +28,7 @@ make-archive-maybe = $(if $(wildcard $1/*), \ " ARCHIVE $(notdir $2)")) CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) -# Makes the definition constant after the first expansion -DOCKER_SRC_COPY = $(eval DOCKER_SRC_COPY := docker-src.$(CUR_TIME))$(DOCKER_SRC_COPY) +DOCKER_SRC_COPY := docker-src.$(CUR_TIME) $(DOCKER_SRC_COPY): @mkdir $@ |