marco 22 years ago
parent
commit
d841f44994

+ 10 - 1
compiler/globals.pas

@@ -135,10 +135,14 @@ interface
        parapreprocess    : boolean;
        printnodefile     : text;
 
+       {  typical cross compiling params}
+
        { directory where the utils can be found (options -FD) }
        utilsdirectory : dirstr;
        { targetname specific prefix used by these utils (options -XP<path>) }
        utilsprefix    : dirstr;
+       { Don't add std paths to linkpath}
+       Dontlinkstdlibpath: Boolean;
 
        { some flags for global compiler switches }
        do_build,
@@ -234,6 +238,7 @@ interface
        RelocSection : boolean = true;
        RelocSectionSetExplicitly : boolean = false;
        LinkTypeSetExplicitly : boolean = false;
+       	
        DLLsource : boolean = false;
        DLLImageBase : pstring = nil;
        UseDeffileForExport : boolean = true;
@@ -1611,6 +1616,7 @@ implementation
       { Utils directory }
         utilsdirectory:='';
         utilsprefix:='';
+               
 
       { Search Paths }
         librarysearchpath:=TSearchPathList.Create;
@@ -1706,7 +1712,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.108  2003-10-08 14:10:16  mazen
+  Revision 1.109  2003-10-11 19:32:04  marco
+   * -Xd
+
+  Revision 1.108  2003/10/08 14:10:16  mazen
   + ASMMODE ATT added to bypass fpc.cfg defaults
 
   Revision 1.107  2003/10/03 22:00:33  peter

+ 5 - 1
compiler/options.pas

@@ -1122,6 +1122,7 @@ begin
                              utilsprefix:=Copy(more,2,length(More)-1);
                              More:='';
                           End;
+                    'd' : Dontlinkstdlibpath:=TRUE;
                     'S' :
                       begin
                         def_symbol('FPC_LINK_STATIC');
@@ -1980,7 +1981,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.108  2003-10-08 19:17:43  peter
+  Revision 1.109  2003-10-11 19:32:04  marco
+   * -Xd
+
+  Revision 1.108  2003/10/08 19:17:43  peter
     * -P to -ap
     * -V to -vv
 

+ 6 - 2
compiler/systems/t_bsd.pas

@@ -195,7 +195,8 @@ end;
 Constructor TLinkerBSD.Create;
 begin
   Inherited Create;
-  LibrarySearchPath.AddPath('/lib;/usr/lib;/usr/X11R6/lib',true);
+  IF NOT Dontlinkstdlibpath Then
+   LibrarySearchPath.AddPath('/lib;/usr/lib;/usr/X11R6/lib',true);
 end;
 
 
@@ -529,7 +530,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.3  2003-10-03 14:16:48  marco
+  Revision 1.4  2003-10-11 19:32:04  marco
+   * -Xd
+
+  Revision 1.3  2003/10/03 14:16:48  marco
    * -XP<prefix> support
 
   Revision 1.2  2003/05/25 23:15:04  marco

+ 6 - 2
compiler/systems/t_linux.pas

@@ -205,7 +205,8 @@ end;
 Constructor TLinkerLinux.Create;
 begin
   Inherited Create;
-  LibrarySearchPath.AddPath('/lib;/usr/lib;/usr/X11R6/lib',true);
+  if NOT Dontlinkstdlibpath Then
+   LibrarySearchPath.AddPath('/lib;/usr/lib;/usr/X11R6/lib',true);
 end;
 
 
@@ -555,7 +556,10 @@ end.
 
 {
   $Log$
-  Revision 1.10  2003-10-03 14:16:48  marco
+  Revision 1.11  2003-10-11 19:32:04  marco
+   * -Xd
+
+  Revision 1.10  2003/10/03 14:16:48  marco
    * -XP<prefix> support
 
   Revision 1.9  2003/07/21 11:52:57  florian

+ 6 - 2
compiler/systems/t_sunos.pas

@@ -209,7 +209,8 @@ end;
 Constructor TLinkersunos.Create;
 begin
   Inherited Create;
-  LibrarySearchPath.AddPath('/lib;/usr/lib;/usr/X11R6/lib;/opt/sfw/lib',true);
+  if NOT Dontlinkstdlibpath Then
+   LibrarySearchPath.AddPath('/lib;/usr/lib;/usr/X11R6/lib;/opt/sfw/lib',true);
 {$ifdef  LinkTest}
      if (cs_link_staticflag in aktglobalswitches) then  WriteLN('ForceLinkStaticFlag');
      if (cs_link_static in aktglobalswitches) then  WriteLN('LinkStatic-Flag');
@@ -488,7 +489,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.5  2003-10-03 14:16:48  marco
+  Revision 1.6  2003-10-11 19:32:04  marco
+   * -Xd
+
+  Revision 1.5  2003/10/03 14:16:48  marco
    * -XP<prefix> support
 
   Revision 1.4  2003/04/27 07:29:52  peter