diff options
author | Nicholas Clark <nick@ccl4.org> | 2007-01-08 21:20:26 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2007-01-08 21:20:26 +0000 |
commit | e81465beff59e6c9907613fe00ebce59d81fb1e8 (patch) | |
tree | 4c6010205cc62e3f79dff3aa7dc7ac005ccccab8 /symbian/xsbuild.pl | |
parent | 3236f110cb098d9081961e6c9f4585ecaf729cc5 (diff) | |
download | perl-e81465beff59e6c9907613fe00ebce59d81fb1e8.tar.gz |
do $file; won't propagate errors from die, as do is an implicit eval.
So need to propagate errors with $@.
p4raw-id: //depot/perl@29723
Diffstat (limited to 'symbian/xsbuild.pl')
-rw-r--r-- | symbian/xsbuild.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl index aee912a1ae..293e702eec 100644 --- a/symbian/xsbuild.pl +++ b/symbian/xsbuild.pl @@ -6,7 +6,7 @@ use Getopt::Long; use File::Basename; use Cwd; -do "sanity.pl"; +do "sanity.pl" or die $@; my $CoreBuild = -d "ext" && -f "perl.h" && -d "symbian" && -f "perl.c"; @@ -64,13 +64,13 @@ my ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION); if ($CoreBuild) { unshift @INC, "symbian"; - do "sanity.pl"; - my %VERSION = %{ do "version.pl" }; + do "sanity.pl" or die $@; + my %VERSION = %{ do "version.pl" or die $@ }; ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION) = - @{ do "sdk.pl" }; + @{ do "sdk.pl" or die $@ }; $VERSION = "$VERSION{REVISION}$VERSION{VERSION}$VERSION{SUBVERSION}"; $R_V_SV = "$VERSION{REVISION}.$VERSION{VERSION}.$VERSION{SUBVERSION}"; - $BUILDROOT = do "cwd.pl"; + $BUILDROOT = do "cwd.pl" or die $@; $PerlVersion = $R_V_SV; } |