diff options
| author | Palmer Dabbelt <palmer@dabbelt.com> | 2017-09-22 17:09:58 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@dabbelt.com> | 2017-09-22 17:09:58 -0700 |
| commit | 5ece74021436c40264707fecde5fc327a1c78bd2 (patch) | |
| tree | e8b5f45f4180667681389471a3cfbb76d1a3f2a1 | |
| parent | 833a74582d1296bbe84de12bb1f1e6555776fe77 (diff) | |
| download | riscv-gnu-toolchain-5ece74021436c40264707fecde5fc327a1c78bd2.zip riscv-gnu-toolchain-5ece74021436c40264707fecde5fc327a1c78bd2.tar.gz riscv-gnu-toolchain-5ece74021436c40264707fecde5fc327a1c78bd2.tar.bz2 | |
Avoid using && to pass environment variables
| -rw-r--r-- | Makefile.in | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/Makefile.in b/Makefile.in index f75ac63..11982a9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -380,25 +380,14 @@ stamps/build-dejagnu: $(srcdir)/riscv-dejagnu $(MAKE) -C $(notdir $@) check-gdb-newlib: stamps/build-gcc-newlib-stage2 stamps/build-dejagnu - export PATH=$(INSTALL_DIR)/bin:$(PATH) && \ - export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \ - cd build-binutils-newlib && \ - $(MAKE) check-gdb "RUNTESTFLAGS=--target_board=riscv-sim" + PATH="$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" $(MAKE) -C build-binutils-newlib check-gdb "RUNTESTFLAGS=--target_board=riscv-sim" stamps/check-gcc-newlib: stamps/build-gcc-newlib-stage2 stamps/build-qemu stamps/build-dejagnu - export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \ - export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \ - export RISC_V_SYSROOT=$(SYSROOT) && \ - cd build-gcc-newlib-stage2 && \ - $(MAKE) check-gcc "RUNTESTFLAGS=--target_board='$(NEWLIB_TARGET_BOARDS)'" + PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(MAKE) -C build-gcc-newlib-stage2 check-gcc "RUNTESTFLAGS=--target_board='$(NEWLIB_TARGET_BOARDS)'" date > $@ stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 stamps/build-qemu stamps/build-dejagnu - export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \ - export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \ - export RISC_V_SYSROOT=$(SYSROOT) && \ - cd build-gcc-linux-stage2 && \ - $(MAKE) check-gcc "RUNTESTFLAGS=--target_board='$(GLIBC_TARGET_BOARDS)'" + PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(MAKE) -C build-gcc-linux-stage2 check-gcc "RUNTESTFLAGS=--target_board='$(GLIBC_TARGET_BOARDS)'" date > $@ .PHONY: check-dhrystone-newlib @@ -411,10 +400,7 @@ stamps/check-dhrystone-newlib-%: \ $(eval $@_ARCH := $(word 4,$(subst -, ,$@))) $(eval $@_ABI := $(word 5,$(subst -, ,$@))) $(eval $@_XLEN := $(patsubst rv32%,32,$(patsubst rv64%,64,$($@_ARCH)))) - export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \ - export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \ - export RISC_V_SYSROOT=$(SYSROOT) && \ - $(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true + PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true .PHONY: check-dhrystone-linux check-dhrystone-linux: $(patsubst %,stamps/check-dhrystone-linux-%,$(GLIBC_MULTILIB_NAMES)) @@ -426,10 +412,7 @@ stamps/check-dhrystone-linux-%: \ $(eval $@_ARCH := $(word 4,$(subst -, ,$@))) $(eval $@_ABI := $(word 5,$(subst -, ,$@))) $(eval $@_XLEN := $(patsubst rv32%,32,$(patsubst rv64%,64,$($@_ARCH)))) - export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \ - export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \ - export RISC_V_SYSROOT=$(SYSROOT) && \ - $(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true + PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true .PHONY: report-gcc-newlib report-gcc-newlib: stamps/check-gcc-newlib |