From 586e682f064ca124a353d992cdf365e0d8234cb7 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Tue, 26 Mar 2019 15:50:47 +0800 Subject: [PATCH] Add conditional compilation for nginx and redis --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index d5621e4..cdcb487 100644 --- a/Makefile +++ b/Makefile @@ -71,19 +71,23 @@ endif busybox: $(busybox) nginx: +ifneq ($(arch), riscv32) ifneq ($(shell uname), Darwin) mkdir -p $(out_dir) @cd nginx && make arch=$(arch) all @cp nginx/build/$(arch)/nginx $(out_dir)/nginx endif +endif redis: +ifneq ($(arch), riscv64) ifneq ($(shell uname), Darwin) mkdir -p $(out_dir) @cd redis && make arch=$(arch) all @cp redis/build/$(arch)/redis-server $(out_dir)/redis-server @cp redis/build/$(arch)/redis-cli $(out_dir)/redis-cli endif +endif build: rust ucore biscuit $(busybox) nginx redis