From 4d62cbd34557de98e9495a360417854613d09db9 Mon Sep 17 00:00:00 2001
From: mrg <mrg@ucsc.edu>
Date: Tue, 8 Feb 2022 12:05:39 -0800
Subject: [PATCH] Move pdk paths to docker invocation

---
 compiler/tests/Makefile | 5 +++++
 docker/set-paths.sh     | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/compiler/tests/Makefile b/compiler/tests/Makefile
index 4f438fe3..4b1e45de 100644
--- a/compiler/tests/Makefile
+++ b/compiler/tests/Makefile
@@ -66,7 +66,10 @@ $(TEST_BASES):
 	@docker run \
 		-v $(TOP_DIR):/openram \
 		-v $(FREEPDK45):/pdk/freepdk45\
+		-e FREEPDK45=/pdk/freepdk45\
 		-v $(PDK_ROOT):/pdk \
+		-e PDK_ROOT=/pdk \
+		-e PDKPATH=/pdk/sky130A \
 		-v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro \
 		--user $(UID):$(GID) \
 		-e OPENRAM_TMP=$(OPENRAM_DIR)/results/$*/tmp \
@@ -83,6 +86,8 @@ mount:
 		-v $(TOP_DIR):/openram \
 		-v $(FREEPDK45):/pdk/freepdk45 \
 		-v $(PDK_ROOT):/pdk \
+		-e PDK_ROOT=/pdk \
+		-e PDKPATH=/pdk/sky130A \
 		-v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro \
 		--user $(UID):$(GID) \
         vlsida/openram-ubuntu:latest
diff --git a/docker/set-paths.sh b/docker/set-paths.sh
index dc9b03ce..386872b5 100644
--- a/docker/set-paths.sh
+++ b/docker/set-paths.sh
@@ -14,14 +14,6 @@ export XYCE_LIB=$XYCE_HOME/lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$XYCE_LIB
 export XYCE_NO_TRACKING="anything at all"
 
-# PDKs
-export FREEPDK45=/pdk/freepdk45
-# Set to the PDK you want to use
-export PDK_DIR=$FREEPDK45
-
-# Skywater PDK
-export PDK_ROOT=/pdk
-
 # OpenRAM
 export OPENRAM_HOME=/openram/compiler
 export OPENRAM_TECH=/openram/technology