Merge branch 'master' into ma@update4

Signed-off-by: louiic <[email protected]>

Author: louiic

flow/Makefile

@@ -353,7 +353,7 @@ $(OBJECTS_DIR)/klayout.lyt: $(KLAYOUT_TECH_FILE) $(OBJECTS_DIR)/klayout_tech.lef
 	sed 's,<lef-files>.*</lef-files>,$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(SC_LEF) $(ADDITIONAL_LEFS),<lef-files>$(shell realpath --relative-to=$(RESULTS_DIR) $(file))</lef-files>),g' $< > $@
 
 $(OBJECTS_DIR)/klayout_wrap.lyt: $(KLAYOUT_TECH_FILE) $(OBJECTS_DIR)/klayout_tech.lef
-	sed 's,<lef-files>.*</lef-files>,$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(WRAP_LEFS),<lef-files>$(shell realpath --relative-to=$(RESULTS_DIR) $(file))</lef-files>),g' $< > $@
+	sed 's,<lef-files>.*</lef-files>,$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(WRAP_LEFS),<lef-files>$(shell realpath --relative-to=$(OBJECTS_DIR)/def $(file))</lef-files>),g' $< > $@
 # Create Macro wrappers (if necessary)
 # ==============================================================================
 WRAP_CFG = $(PLATFORM_DIR)/wrapper.cfg

flow/util/generate-vars.sh

@@ -20,10 +20,6 @@ do
         continue
     fi
     rhs=`sed -e 's/^"//' -e 's/"$//' <<<"${V#*=}"`
-    if [[ "${rhs}" == "''" ]]; then
-        echo "Skiping empty variable ${V}"
-        continue
-    fi
     # handle absolute paths
     if [[ "${rhs}" == /* ]]; then
         if [[ ! -e "${rhs}" ]]; then