Skip to content

Commit 2b9473d

Browse files
committed
makefile: use tee abspath consistently
Signed-off-by: Øyvind Harboe <[email protected]>
1 parent 24d910a commit 2b9473d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

flow/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ synth-report: synth
437437

438438
.PHONY: do-synth-report
439439
do-synth-report:
440-
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/synth_metrics.tcl) 2>&1 | tee $(LOG_DIR)/1_1_yosys_metrics.log
440+
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/synth_metrics.tcl) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys_metrics.log)
441441

442442
.PHONY: memory
443443
memory:
@@ -860,7 +860,7 @@ generate_abstract: $(RESULTS_DIR)/6_final.gds $(RESULTS_DIR)/6_final.def $(RESU
860860
.PHONY: do-generate_abstract
861861
do-generate_abstract:
862862
mkdir -p $(LOG_DIR) $(REPORTS_DIR)
863-
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/generate_abstract.tcl -metrics $(LOG_DIR)/generate_abstract.json) 2>&1 | tee $(LOG_DIR)/generate_abstract.log
863+
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/generate_abstract.tcl -metrics $(LOG_DIR)/generate_abstract.json) 2>&1 | tee $(abspath $(LOG_DIR)/generate_abstract.log)
864864

865865
.PHONY: clean_abstract
866866
clean_abstract:
@@ -878,7 +878,7 @@ $(WRAPPED_GDSOAS): $(OBJECTS_DIR)/klayout_wrap.lyt $(WRAPPED_LEFS)
878878
-rd out_file=$@ \
879879
-rd tech_file=$(OBJECTS_DIR)/klayout_wrap.lyt \
880880
-rd layer_map=$(GDS_LAYER_MAP) \
881-
-r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(LOG_DIR)/6_merge_$(basename $(notdir $@)).log
881+
-r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(abspath $(LOG_DIR)/6_merge_$(basename $(notdir $@)).log)
882882

883883
# Merge GDS using Klayout
884884
#-------------------------------------------------------------------------------
@@ -896,7 +896,7 @@ do-gds-merged:
896896
-rd out_file=$(GDS_MERGED_FILE) \
897897
-rd tech_file=$(OBJECTS_DIR)/klayout.lyt \
898898
-rd layer_map=$(GDS_LAYER_MAP) \
899-
-r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(LOG_DIR)/6_1_merge.log
899+
-r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(abspath $(LOG_DIR)/6_1_merge.log)
900900

901901
$(RESULTS_DIR)/6_final.v: $(LOG_DIR)/6_report.log
902902

@@ -916,15 +916,15 @@ ifneq ($(KLAYOUT_DRC_FILE),)
916916
$(call KLAYOUT_FOUND)
917917
($(TIME_CMD) $(KLAYOUT_CMD) -zz -rd in_gds="$<" \
918918
-rd report_file=$(abspath $@) \
919-
-r $(KLAYOUT_DRC_FILE)) 2>&1 | tee $(LOG_DIR)/6_drc.log
919+
-r $(KLAYOUT_DRC_FILE)) 2>&1 | tee $(abspath $(LOG_DIR)/6_drc.log)
920920
# Hacky way of getting DRV count (don't error on no matches)
921921
grep -c "<value>" $@ > $(REPORTS_DIR)/6_drc_count.rpt || [[ $$? == 1 ]]
922922
else
923923
echo "DRC not supported on this platform" > $@
924924
endif
925925

926926
$(RESULTS_DIR)/6_final.cdl: $(RESULTS_DIR)/6_final.v
927-
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/cdl.tcl) 2>&1 | tee $(LOG_DIR)/6_cdl.log
927+
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/cdl.tcl) 2>&1 | tee $(abspath $(LOG_DIR)/6_cdl.log)
928928

929929
$(OBJECTS_DIR)/6_final_concat.cdl: $(RESULTS_DIR)/6_final.cdl $(CDL_FILE)
930930
cat $^ > $@
@@ -938,7 +938,7 @@ ifneq ($(KLAYOUT_LVS_FILE),)
938938
($(TIME_CMD) $(KLAYOUT_CMD) -b -rd in_gds="$<" \
939939
-rd cdl_file=$(abspath $(OBJECTS_DIR)/6_final_concat.cdl) \
940940
-rd report_file=$(abspath $@) \
941-
-r $(KLAYOUT_LVS_FILE)) 2>&1 | tee $(LOG_DIR)/6_lvs.log
941+
-r $(KLAYOUT_LVS_FILE)) 2>&1 | tee $(abspath $(LOG_DIR)/6_lvs.log)
942942
else
943943
echo "LVS not supported on this platform" > $@
944944
endif

0 commit comments

Comments
 (0)