No comments

diff --git a/src/WOKBuilderDef/LDSHR.edl b/src/WOKBuilderDef/LDSHR.edl
index 39ae77cb0a380538480eef918bf22fb3fa2fb6bf..190f0fb35d6ab73d774a3a950c78fd2ae3aba092 100755 (executable)
--- a/src/WOKBuilderDef/LDSHR.edl
+++ b/src/WOKBuilderDef/LDSHR.edl
@@ -55,8 +55,8 @@
    $\^
   @end;
 
-  @template LDSHR_Header ( %Target, %LDSHR_DBMSOpt ) is
-   $/usr/bin/g++ -shared %LDSHR_DBMSOpt -o %Target \
+  @template LDSHR_Header ( %Target, %LDSHR_DBMSOpt, %CSF_LINKER_SysShared ) is
+   $/usr/bin/g++ %CSF_LINKER_SysShared %LDSHR_DBMSOpt -o %Target \
   @end;
 
   @template LDSHR_Footer () is
@@ -64,8 +64,8 @@
    $ set ld_status=$status;
   @end;
 
-  @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt ) is
-   $/usr/bin/ld -nostartfiles %LDSHR_DBMSOpt -o %Target \
+  @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt,%CSF_LINKER_CheckOpt ) is
+   $/usr/bin/ld  %CSF_LINKER_CheckOpt  %LDSHR_DBMSOpt -o %Target \
   @end;
 
   @template LDSHR_CheckUndefFooter () is
@@ -127,14 +127,14 @@
  @if( %Station == "ao1") then
   @set %LDSHR_LibLimit = "1";
 
-  @template LDSHR_Header ( %LDSHR_DBMSOpt, %Target, %LogicalName ) is 
-   $cxx -shared %LDSHR_DBMSOpt -msym -o %Target -soname %LogicalName -expect_unresolved '*' \
+  @template LDSHR_Header ( %LDSHR_DBMSOpt, %Target, %LogicalName, %CSF_LINKER_SysShared) is 
+   $cxx %CSF_LINKER_SysShared %LDSHR_DBMSOpt -msym -o %Target -soname %LogicalName -expect_unresolved '*' \
   @end;
  @endif;
 
  @if( %Station == "sil" ) then
-  @template LDSHR_Header ( %LDSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList ) is
-   $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -ignore_unresolved -shared %LDSHR_DBMSOpt -o %Target \
+  @template LDSHR_Header ( %LDSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList,%CSF_LINKER_SysShared ) is
+   $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -ignore_unresolved %CSF_LINKER_SysShared %LDSHR_DBMSOpt -o %Target \
    $  -all -none \
   @end;
 

diff --git a/src/WOKBuilderDef/LINKSHR.edl b/src/WOKBuilderDef/LINKSHR.edl
index a5d78b7016c30c96e367d611be9c15ab13d44770..3c43ad0c9bc4e465c7e87db10325a16678c60823 100755 (executable)
--- a/src/WOKBuilderDef/LINKSHR.edl
+++ b/src/WOKBuilderDef/LINKSHR.edl
@@ -30,7 +30,7 @@
  @else
   @set %LINKSHR_DBMSOpt = "";
  @endif;
-@set %LINKSHR_DBMSOpt =  %CSF_LINKER_CheckOpt ;
+---@set %LINKSHR_DBMSOpt =  %CSF_LINKER_CheckOpt ;
 
 
  @if ( %Station != "hp" ) then
@@ -100,8 +100,8 @@
  @if( %Station == "ao1") then
   @set %LINKSHR_LibLimit = "300";
 
-  @template LINKSHR_Header ( %LINKSHR_DBMSOpt, %Target, %LogicalName ) is 
-   $cxx -shared %LINKSHR_DBMSOpt -msym -o %Target -soname %LogicalName \
+  @template LINKSHR_Header ( %LINKSHR_DBMSOpt, %Target, %LogicalName, %CSF_LINKER_SysShared ) is 
+   $cxx %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -msym -o %Target -soname %LogicalName \
   @end;
  @endif;
 
@@ -112,9 +112,9 @@
    $\^
   @end;
 
-  @template LINKSHR_Header ( %LINKSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList ) is
-   --$/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink -shared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
-   $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink -shared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
+  @template LINKSHR_Header ( %LINKSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList, %CSF_LINKER_SysShared ) is
+   --$/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
+   $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
    $  -all -objectlist %LD_ObjList -none \
   @end;
 
@@ -215,8 +215,8 @@
    $\^
   @end;
 
-  @template LINKSHR_Header ( %Target, %LINKSHR_DBMSOpt ) is
-   $/usr/bin/g++ -shared %LINKSHR_DBMSOpt -o %Target \
+  @template LINKSHR_Header ( %Target, %LINKSHR_DBMSOpt ,%CSF_LINKER_SysShared   ) is
+   $/usr/bin/g++ %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -o %Target \
   @end;
 
   @template LINKSHR_Footer () is
@@ -228,7 +228,7 @@
   @end;
 
   @template LINKSHR_CheckUndefHeader (
-             %Target, %LINKSHR_DBMSOpt, %LD_LIBRARY_PATH
+             %Target, %LINKSHR_DBMSOpt, %LD_LIBRARY_PATH, %CSF_LINKER_CheckOpt 
             ) is 
    $if ( $?LD_LIBRARY_PATH ) then
    $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH:${LD_LIBRARY_PATH}
@@ -236,7 +236,7 @@
    $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH
    $endif
    $echo "Check of undefined symbols with LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-   $/usr/bin/ld -nostartfiles -o /dev/null \
+   $/usr/bin/ld %CSF_LINKER_CheckOpt -o /dev/null \
   @end;
 
   @template LINKSHR_CheckUndefFooter () is