diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-10-09 10:37:23 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-10-09 10:46:48 +0200 |
| commit | b120689ab0eddfd0e1c5d7be74d6acf2ce0181c9 (patch) | |
| tree | e7fd427d6cbca8ac4466fa1bee1293a23bdff518 | |
| parent | bf467badca422346778e23165e58ab4b7c8d6ab1 (diff) | |
Revert "use downloaded rebase.exe with Win8 SDK"
This reverts commit e994a91060c145ad08ef75dcf9862043202ac6ce.
| -rw-r--r-- | postprocess/rebase/rebase.pl | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl index f5e5ce05ccf1..546068efade2 100644 --- a/postprocess/rebase/rebase.pl +++ b/postprocess/rebase/rebase.pl @@ -179,13 +179,7 @@ sub rebase_again my $newfiles_ref = shift; my @grownfiles; my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}"; - my $command; - if ( $ENV{REBASE} eq "download" ) { - $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; - } - else { - $command = "rebase " . $options_string; - } + my $command = "rebase " . $options_string; if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } @@ -247,13 +241,7 @@ sub rebase_again sub rebase_initially { my ($files_ref, $start_address) = @_; - my $command; - if ( $ENV{REBASE} eq "download" ) { - $command = $ENV{OUTDIR}."/bin/rebase " . $options_string; - } - else { - $command = "rebase " . $options_string; - } + my $command = "rebase "; if ( $ENV{WRAPCMD} ) { $command = $ENV{WRAPCMD} . " " . $command; } |