diff options
| author | Robert Norton <rmn30@cam.ac.uk> | 2020-01-31 09:41:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 09:41:35 +0000 |
| commit | 93983d54d973dbc67a9332b1c9241ddbc7535a31 (patch) | |
| tree | 1e4ba4892dd095e6ff27dcd6f0f44d84f1a3d06e | |
| parent | 6d3b1aa8c26c670164aa58a2e23fb146efc90089 (diff) | |
| parent | 5ad7ae409c5fbf1dce278fc22d9406951548a28e (diff) | |
| download | sail-riscv-93983d54d973dbc67a9332b1c9241ddbc7535a31.zip sail-riscv-93983d54d973dbc67a9332b1c9241ddbc7535a31.tar.gz sail-riscv-93983d54d973dbc67a9332b1c9241ddbc7535a31.tar.bz2 | |
Merge pull request #37 from scottj97/recursive-make
Invoke recursive make using $(MAKE) as GNU recommends
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -221,7 +221,7 @@ generated_definitions/c/riscv_model_$(ARCH).c: $(SAIL_SRCS) model/main.sail Make $(SAIL) $(SAIL_FLAGS) -O -Oconstant_fold -memo_z3 -c -c_include riscv_prelude.h -c_include riscv_platform.h -c_no_main $(SAIL_SRCS) model/main.sail -o $(basename $@) $(SOFTFLOAT_LIBS): - make SPECIALIZE_TYPE=$(SOFTFLOAT_SPECIALIZE_TYPE) -C $(SOFTFLOAT_LIBDIR) + $(MAKE) SPECIALIZE_TYPE=$(SOFTFLOAT_SPECIALIZE_TYPE) -C $(SOFTFLOAT_LIBDIR) # convenience target .PHONY: csim @@ -387,7 +387,7 @@ clean: -rm -rf generated_definitions/ocaml/* generated_definitions/c/* generated_definitions/latex/* -rm -rf generated_definitions/lem/* generated_definitions/isabelle/* generated_definitions/hol4/* generated_definitions/coq/* -rm -rf generated_definitions/for-rmem/* - -make -C $(SOFTFLOAT_LIBDIR) clean + -$(MAKE) -C $(SOFTFLOAT_LIBDIR) clean -rm -f c_emulator/riscv_sim_RV32 c_emulator/riscv_sim_RV64 c_emulator/riscv_rvfi_RV32 c_emulator/riscv_rvfi_RV64 -rm -rf ocaml_emulator/_sbuild ocaml_emulator/_build ocaml_emulator/riscv_ocaml_sim_RV32 ocaml_emulator/riscv_ocaml_sim_RV64 ocaml_emulator/tracecmp -rm -f *.gcno *.gcda |