X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=support%2Fmake%2Fmsp%2Fbsl.extra;h=d5c0f54e3235877e3c4d51cc2281b28dfba6b5c2;hb=681199f1eee24b52ddd0142782925bffc39b6936;hp=07db9ced0186ea831b7605bab45074cda0f1594d;hpb=519c19dd71e2e0792e6cacc60e4eb333671d7816;p=tinyos-2.x.git diff --git a/support/make/msp/bsl.extra b/support/make/msp/bsl.extra index 07db9ced..d5c0f54e 100644 --- a/support/make/msp/bsl.extra +++ b/support/make/msp/bsl.extra @@ -20,9 +20,9 @@ BSL ?= auto MSP_BSL_FLAGS ?= --telos ifeq ($(BSL),auto) -BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+),/; print $$1;' ) +BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+)[^,]*)/; print $$1;' ) BSLTEST_COMMENT = "using bsl,auto" -BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+),/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' ) +BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+)[^,]*)/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' ) BSL_TARGETS += bsltest else ifeq ($(BSL:ref,%=ref),ref)