From edd4f902833f01a4244b8b579e660b2d929186eb Mon Sep 17 00:00:00 2001 From: Jacob Pease Date: Fri, 1 Dec 2023 13:21:33 -0600 Subject: [PATCH 1/2] Disassemble target now called with correct environment variables, allowing for downloading, building, disassembling, and installing in one make call. --- linux/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index cc19c7f2a..a78b85229 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -30,13 +30,13 @@ OBJDUMPS := $(foreach name, $(OBJDUMPS), $(DIS)/$(name).objdump) .PHONY: all generate disassemble install clean cleanDTB cleanDriver test -all: download Image disassemble install +all: download Image install # disassemble install Image: make -C $(BUILDROOT) --jobs $(MAKE) generate # TODO: Need to find a way to set the PATH for child processes. - # source ../setup.sh; $(MAKE) disassemble + bash -c "source ../setup.sh; $(MAKE) disassemble" install: sudo rm -rf $(RISCV)/$(BUILDROOT) From f99cb03b89afcf3bdfd4941a6b595f769e0e2761 Mon Sep 17 00:00:00 2001 From: Jacob Pease Date: Fri, 1 Dec 2023 15:02:26 -0600 Subject: [PATCH 2/2] Changed Linux makefile to unset LD_LIBRARY_PATH before running buildroot. This allows custom setup.sh scripts to be used per user. --- linux/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index a78b85229..9ef677d55 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -30,13 +30,11 @@ OBJDUMPS := $(foreach name, $(OBJDUMPS), $(DIS)/$(name).objdump) .PHONY: all generate disassemble install clean cleanDTB cleanDriver test -all: download Image install # disassemble install +all: download Image disassemble install Image: - make -C $(BUILDROOT) --jobs + bash -c "unset LD_LIBRARY_PATH; make -C $(BUILDROOT) --jobs;" $(MAKE) generate - # TODO: Need to find a way to set the PATH for child processes. - bash -c "source ../setup.sh; $(MAKE) disassemble" install: sudo rm -rf $(RISCV)/$(BUILDROOT)