Merge pull request #1173 from Pinata-Consulting/make-update-ok-no-openroad-inpath-same-as-other-targets

Make update ok no openroad inpath same as other targets

Author: vvbandeira

flow/Makefile

@@ -269,9 +269,9 @@ endif
 # Priority is given to
 #       1 user include path to the executable prior to running make
 #       2 user explicit set with variable in Makefile or command line
-OPENROAD_EXE            ?= $(shell command -v openroad)
+export OPENROAD_EXE            ?= $(shell command -v openroad)
 ifeq ($(OPENROAD_EXE),)
-  OPENROAD_EXE           = $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
+  export OPENROAD_EXE           = $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
 endif
 OPENROAD_ARGS            = -no_init $(OR_ARGS)
 OPENROAD_CMD             = $(OPENROAD_EXE) -exit $(OPENROAD_ARGS)

flow/util/genMetrics.py

@@ -208,7 +208,7 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
     metrics_dict = defaultdict(dict)
     metrics_dict['run__flow__generate_date'] = now.strftime('%Y-%m-%d %H:%M')
     metrics_dict['run__flow__metrics_version'] = 'Metrics_2.1.2'
-    cmdOutput = check_output(['openroad', '-version'])
+    cmdOutput = check_output([os.environ.get('OPENROAD_EXE', 'openroad'), '-version'])
     cmdFields = [x.decode('utf-8') for x in cmdOutput.split()]
     metrics_dict['run__flow__openroad_version'] = str(cmdFields[0])
     if len(cmdFields) > 1:

flow/util/utils.mk

@@ -120,12 +120,12 @@ command:
 
 ## Provide easy access to debugging
 ifdef GDB
-OPENROAD_EXE := gdb --args $(OPENROAD_EXE)
+export OPENROAD_EXE := gdb --args $(OPENROAD_EXE)
 endif
 
 ## Provide easy way to run valgrind
 ifdef VALGRIND
-OPENROAD_EXE := valgrind $(VALGRIND_ARGS) $(OPENROAD_EXE)
+export OPENROAD_EXE := valgrind $(VALGRIND_ARGS) $(OPENROAD_EXE)
 endif
 
 ## Convert RVE DRC database to JSON