From bea0cd4b4433b7ab17efeb63ee46aef0a0a6f543 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 16 Aug 2007 03:39:16 +0100 Subject: [PATCH] hide errors in uname test --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7ee8667..1c1408c 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ java = java -Xmx500m run: fleet.jar; $(java) $(cp) $(interpreter_class) -ifeq ($(shell uname -o),Cygwin) +ifeq ($(shell uname -o 2>/dev/null),Cygwin) ps=\; else ps=: @@ -79,8 +79,9 @@ build/main.bit: build/fabric.v $(verilog_files) for A in `find ships -name \*.ship`;\ do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\ done + $(java) -cp fleet.jar edu.berkeley.fleet.slipway.Generator rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir} - ssh ${host} 'time make -C ${remote_dir} synth XILINX=${remote_xilinx}' + time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}' scp ${host}:${remote_dir}/build/main.bit build/ synth: -- 1.7.10.4