sbolint: allow -march= in comments. sbodl: fix spacing.

1 files changed, 3 insertions, 2 deletions

diff --git a/sbolint b/sbolint
index 3b252dc..5e574fc 100755
--- a/sbolint
+++ b/sbolint
@@ -1262,7 +1262,8 @@ sub check_script {
 			}
 		} elsif(/^PKG=(\S+)/) {
 			$pkg = dequote($1);
-			if($pkg ne '$TMP/package-$PRGNAM') {
+			$pkg =~ s,\$\{([A-Z]+)\},\$$1,; # de-brace
+			if($pkg ne '$TMP/package-$PRGNAM' && $pkg ne '$TMP/package-${PRGNAM}') {
 				log_error("$file:$lineno: PKG=\$TMP/package-\$PRGNAM is required");
 			}
 		} elsif(/^OUTPUT=(\S+)/) {
@@ -1333,7 +1334,7 @@ sub check_script {
 			$old_arch = $lineno;
 		}
 
-		if(/-march=['"]?i[34]86/) {
+		if(/^[^#]*\s-march=['"]?i[34]86/) {
 			$old_flags = $lineno;
 		}