diff options
| author | Alex Bennée | 2019-09-04 11:07:17 +0200 |
|---|---|---|
| committer | Alex Bennée | 2019-09-10 10:38:33 +0200 |
| commit | 71ebbe09e97894f4c573b8fd77e627530a4cba49 (patch) | |
| tree | b261f688e6bfd3f10316b67180c7ceaf519a30d1 /tests/tcg | |
| parent | tests/docker: Use --userns=keep-id for podman (diff) | |
| download | qemu-71ebbe09e97894f4c573b8fd77e627530a4cba49.tar.gz qemu-71ebbe09e97894f4c573b8fd77e627530a4cba49.tar.xz qemu-71ebbe09e97894f4c573b8fd77e627530a4cba49.zip | |
tests/docker: fix "cc" command to work with podman
Podman requires a little bit of additional magic to the uid mapping
which was already done for the normal RunCommand. We simplify the
logic by pushing it directly into the Docker::run method to avoid
instantiating an extra Docker() object and ensure the CC command
always runs as the current user.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/tcg')
| -rw-r--r-- | tests/tcg/Makefile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index 73b5626fc5..210f842823 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -41,7 +41,7 @@ ifneq ($(DOCKER_IMAGE),) # We also need the Docker make rules to depend on include $(SRC_PATH)/tests/docker/Makefile.include -DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \ +DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \ --cc $(DOCKER_CROSS_COMPILER) \ -i qemu:$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " |