# HG changeset patch
# User Mike Kinghan <mikek@symbian.org>
# Date 1291204961 0
# Node ID cf609178ac39c4488168a2e89c94e850e0ca4de3
# Parent  1600211976c3d73485ab55b9de91d77cfa5c8371
1) fix_tools_exports.pl need only be run on Windows hosts; was run unnecessarily on Linux too.
2) Need to export modload.pm on Linux as well as Windows hosts.

diff -r 1600211976c3 -r cf609178ac39 cross-plat-dev-utils/fix_epoc32.pl
--- a/cross-plat-dev-utils/fix_epoc32.pl	Sat Nov 27 17:23:11 2010 +0000
+++ b/cross-plat-dev-utils/fix_epoc32.pl	Wed Dec 01 12:02:41 2010 +0000
@@ -14,8 +14,6 @@
 use check_os;
 use perl_run;
 
-my $rc = perl_run("fix_tool_exports.pl @ARGV");
-exit $rc, if $rc;
 if (os_is_windows()) {
 	exit perl_run("fix_epoc32_win.pl @ARGV");
 }
diff -r 1600211976c3 -r cf609178ac39 cross-plat-dev-utils/fix_epoc32_win.pl
--- a/cross-plat-dev-utils/fix_epoc32_win.pl	Sat Nov 27 17:23:11 2010 +0000
+++ b/cross-plat-dev-utils/fix_epoc32_win.pl	Wed Dec 01 12:02:41 2010 +0000
@@ -16,6 +16,7 @@
 use usage;
 use check_os;
 use File::Spec;
+use perl_run;
 
 require_os_windows();
 usage(\@ARGV,"This script makes required fixes to epoc32 tree in Windows");
@@ -33,5 +34,5 @@
 apply_patch_file($libwsock32_deb);
 apply_patch_file($libwsock32_rel);
 apply_patch_file($s60_sbs_config_xml);
-exit 0;
+exit perl_run("fix_tool_exports.pl @ARGV");
 
diff -r 1600211976c3 -r cf609178ac39 sbsv1/abld/group/bld.inf
--- a/sbsv1/abld/group/bld.inf	Sat Nov 27 17:23:11 2010 +0000
+++ b/sbsv1/abld/group/bld.inf	Wed Dec 01 12:02:41 2010 +0000
@@ -53,7 +53,8 @@
 ../genutil/ecopyfile.pl        /epoc32/tools/ecopyfile.pl
 ../genutil/conv_khronos_hdr_to_cpp.pl        /epoc32/tools/conv_khronos_hdr_to_cpp.pl  
 ../e32util/armasm2as.pl        /epoc32/tools/armasm2as.pl
-../e32util/copyfeaturevariants.pl        /epoc32/tools/copyfeaturevariants.pl 
+../e32util/copyfeaturevariants.pl        /epoc32/tools/copyfeaturevariants.pl
+../genutil/modload.pm        /epoc32/tools/modload.pm 
 
 // BSF files
 ../platform/armv6.bsf        /epoc32/tools/armv6.bsf 
@@ -68,9 +69,7 @@
 
 #ifdef SBSV2
 #ifndef TOOLS2_LINUX
-// export Symbian Build System v1 in case of no confliction.
-
-../genutil/modload.pm        /epoc32/tools/modload.pm  
+// export Symbian Build System v1 in case of no confliction.  
 ../bldmake/linkdeps.pl        /epoc32/tools/linkdeps.pl  
 ../platform/cl_gccxml.pm        /epoc32/tools/cl_gccxml.pm 
 ../platform/ide_cw.pm        /epoc32/tools/ide_cw.pm