Skip to content

Commit bb7c4ac

Browse files
committed
fiilter out klayout var
Signed-off-by: habibayassin <[email protected]>
1 parent 9f75d56 commit bb7c4ac

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

flow/util/makeIssue.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
set -euo pipefail
44

5-
if [[ -z "$ISSUE_VARIABLES" ]]; then
6-
echo "ERROR: KLayout not found in PATH" 1>&2
7-
exit 1
8-
fi
9-
105
currentDate=$(date +"%Y-%m-%d_%H-%M")
116
ISSUE_TAG=${ISSUE_TAG:-"${DESIGN_NICKNAME}_${PLATFORM}_${FLOW_VARIANT}_${currentDate}"}
127
ISSUE_CP_DESIGN_FILE_VARS="SDC_FILE \
@@ -78,7 +73,6 @@ echo "Creating ${VARS_BASENAME}.sh/tcl script"
7873
rm -f ${VARS_BASENAME}.sh ${VARS_BASENAME}.tcl ${VARS_BASENAME}.gdb || true
7974

8075
EXCLUDED_VARS="MAKE|PYTHONPATH|PKG_CONFIG_PATH|PERL5LIB|PCP_DIR|PATH|MANPATH|LD_LIBRARY_PATH|INFOPATH|HOME|PWD|MAIL"
81-
8276
printf '%s\n' "$ISSUE_VARIABLES" | while read -r V;
8377
do
8478
if [[ ! ${V%=*} =~ ^[[:digit:]] && ${V} == *"="* && ! -z ${V#*=} && ${V%=*} != *"MAKE"* && ! ${V%=*} =~ ^(${EXCLUDED_VARS})$ ]] ; then

flow/util/utils.mk

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ define \n
7777

7878
endef
7979

80-
ifneq ($(shell command -v klayout),)
81-
export ISSUE_VARIABLES := $(foreach V, $(.VARIABLES),$(if $(filter-out environment% default automatic, $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD%, $(V)),$V=$($V))${\n}))
82-
else
83-
export ISSUE_VARIABLES =
84-
endif
80+
export ISSUE_VARIABLES := $(foreach V, $(.VARIABLES),$(if $(filter-out environment% default automatic, $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD% KLAYOUT%, $(V)),$V=$($V))${\n}))
8581

8682
$(foreach script,$(ISSUE_SCRIPTS),$(script)_issue): %_issue : versions.txt
8783
$(UTILS_DIR)/makeIssue.sh $*

0 commit comments

Comments
 (0)