diff -r 7333d7932ef7 -r 8b7f4e561641 installationservices/swi/source/certstoretobin/AppGen.pm --- a/installationservices/swi/source/certstoretobin/AppGen.pm Tue Aug 31 15:21:33 2010 +0300 +++ b/installationservices/swi/source/certstoretobin/AppGen.pm Wed Sep 01 12:22:02 2010 +0100 @@ -281,27 +281,17 @@ chdir "$output_dir" or$util->error("chdir $output_dir failed"); - my $RVCTVersion = $ENV{'ARMV5VER'}; - if((index($RVCTVersion, "RVCT4.0") != -1) && ($platform eq "armv5")) - { - my $platformConfig = "arm."."v5."."$variant".".rvct4_0"; - $util->info($platformConfig); - $util->invoke("sbs -b bld.inf -c $platformConfig"); - } - else - { - if ($BuildSystemVersion == "2") - { - my $platformConfig = "$platform"."_"."$variant"; - $util->invoke("sbs -c $platformConfig"); - } - else - { - $util->invoke("bldmake bldfiles"); - $util->invoke("abld build $platform $variant"); - $util->invoke("abld -check build $platform $variant"); - } - } + if ($BuildSystemVersion == "2") + { + my $platformConfig = "$platform"."_"."$variant"; + $util->invoke("sbs -c $platformConfig"); + } + else + { + $util->invoke("bldmake bldfiles"); + $util->invoke("abld build $platform $variant"); + $util->invoke("abld -check build $platform $variant"); + } chdir "$whence" or $util->error("chdir $whence failed");