From c03fc2b97bbab2f5f37a41c991cd31d905a740b1 Mon Sep 17 00:00:00 2001 From: Zihao Yu Date: Fri, 27 Aug 2021 19:23:59 +0800 Subject: [PATCH] nemu: restore previous config when it fails to build the AM version --- kernels/nemu/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kernels/nemu/Makefile b/kernels/nemu/Makefile index 2cf0f38..deb8a14 100644 --- a/kernels/nemu/Makefile +++ b/kernels/nemu/Makefile @@ -7,6 +7,7 @@ $(error Only support with NEMU) endif TMPDEFCONFIG = tmp_defconfig +TMPDEFCONFIG_FILE = $(NEMU_HOME)/configs/$(TMPDEFCONFIG) all: $(MAKE) save_config @@ -16,14 +17,15 @@ all: save_config: $(MAKE) -C $(NEMU_HOME) savedefconfig - mv $(NEMU_HOME)/configs/defconfig $(NEMU_HOME)/configs/$(TMPDEFCONFIG) + mv $(NEMU_HOME)/configs/defconfig $(TMPDEFCONFIG_FILE) build_am: $(MAKE) -C $(NEMU_HOME) $(ISA)-am_defconfig - $(MAKE) -C $(NEMU_HOME) ARCH=$(ARCH) mainargs=$(mainargs) + $(MAKE) -C $(NEMU_HOME) ARCH=$(ARCH) mainargs=$(mainargs) || \ + ($(MAKE) restore_config; false) restore_config: $(MAKE) -C $(NEMU_HOME) ARCH=$(ARCH) $(TMPDEFCONFIG) - rm $(NEMU_HOME)/configs/$(TMPDEFCONFIG) + rm $(TMPDEFCONFIG_FILE) .PHONY: all save_config build_am restore_config