makefile: less iffy tapcell code

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

flow/Makefile

@@ -715,11 +715,7 @@ $(eval $(call do-step,2_4_floorplan_macro,$(RESULTS_DIR)/2_3_floorplan_tdms.odb
 
 # STEP 5: Tapcell and Welltie insertion
 #-------------------------------------------------------------------------------
-ifeq ($(TAPCELL_TCL),)
-$(eval $(call do-copy,2_5_floorplan_tapcell,2_4_floorplan_macro.odb))
-else
 $(eval $(call do-step,2_5_floorplan_tapcell,$(RESULTS_DIR)/2_4_floorplan_macro.odb $(TAPCELL_TCL),tapcell))
-endif
 
 # STEP 6: PDN generation
 #-------------------------------------------------------------------------------

flow/scripts/tapcell.tcl

@@ -1,8 +1,9 @@
 source $::env(SCRIPTS_DIR)/load.tcl
-load_design 2_4_floorplan_macro.odb 1_synth.sdc
 
-if {[info exist ::env(TAPCELL_TCL)]} {
+if {[env_var_exists_and_non_empty TAPCELL_TCL]} {
+  load_design 2_4_floorplan_macro.odb 1_synth.sdc
   source $::env(TAPCELL_TCL)
+  write_db $::env(RESULTS_DIR)/2_5_floorplan_tapcell.odb
+} else {
+  log_cmd exec cp $::env(RESULTS_DIR)/2_4_floorplan_macro.odb $::env(RESULTS_DIR)/2_5_floorplan_tapcell.odb
 }
-
-write_db $::env(RESULTS_DIR)/2_5_floorplan_tapcell.odb