|
Lines 1-5
Link Here
|
| 1 |
--- compiler/systems/t_bsd.pas 2014-12-07 15:27:02.000000000 -0500 |
1 |
--- compiler/systems/t_bsd.pas 2014-12-07 15:27:02.000000000 -0500 |
| 2 |
+++ compiler/systems/t_bsd.pas 2019-08-15 01:12:52.940972000 -0500 |
2 |
+++ compiler/systems/t_bsd.pas 2019-09-02 21:10:43.316197000 -0500 |
|
|
3 |
@@ -146,8 +146,8 @@ |
| 4 |
begin |
| 5 |
if not(target_info.system in systems_darwin) then |
| 6 |
begin |
| 7 |
- ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES'; |
| 8 |
- DllCmd[1]:='ld $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES' |
| 9 |
+ ExeCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES'; |
| 10 |
+ DllCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES' |
| 11 |
end |
| 12 |
else |
| 13 |
begin |
| 14 |
@@ -166,22 +166,22 @@ |
| 15 |
programs with problems that require Valgrind will have more |
| 16 |
than 60KB of data (first 4KB of address space is always invalid) |
| 17 |
} |
| 18 |
- ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; |
| 19 |
+ ExeCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; |
| 20 |
if not(cs_gdb_valgrind in current_settings.globalswitches) then |
| 21 |
ExeCmd[1]:=ExeCmd[1]+' -pagezero_size 0x10000'; |
| 22 |
{$else ndef cpu64bitaddr} |
| 23 |
- ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; |
| 24 |
+ ExeCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; |
| 25 |
{$endif ndef cpu64bitaddr} |
| 26 |
if (apptype<>app_bundle) then |
| 27 |
- DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES' |
| 28 |
+ DllCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES' |
| 29 |
else |
| 30 |
- DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES' |
| 31 |
+ DllCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES' |
| 32 |
end |
| 33 |
end |
| 34 |
else |
| 35 |
begin |
| 36 |
- ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES'; |
| 37 |
- DllCmd[1]:='ld $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES'; |
| 38 |
+ ExeCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES'; |
| 39 |
+ DllCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES'; |
| 40 |
end; |
| 41 |
if not(target_info.system in systems_darwin) then |
| 42 |
DllCmd[2]:='strip --strip-unneeded $EXE' |
| 3 |
@@ -192,6 +192,8 @@ |
43 |
@@ -192,6 +192,8 @@ |
| 4 |
DynamicLinker:='/usr/libexec/ld.so' |
44 |
DynamicLinker:='/usr/libexec/ld.so' |
| 5 |
else if target_info.system in systems_netbsd then |
45 |
else if target_info.system in systems_netbsd then |
|
Lines 14-20
Link Here
|
| 14 |
begin |
54 |
begin |
| 15 |
S:=SharedLibFiles.GetFirst; |
55 |
S:=SharedLibFiles.GetFirst; |
| 16 |
- if (s<>'c') or reorder then |
56 |
- if (s<>'c') or reorder then |
| 17 |
+ if ((((((s<>'c') and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) or reorder then |
57 |
+ if (((((((s<>'c') and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) or reorder then |
| 18 |
begin |
58 |
begin |
| 19 |
i:=Pos(target_info.sharedlibext,S); |
59 |
i:=Pos(target_info.sharedlibext,S); |
| 20 |
if i>0 then |
60 |
if i>0 then |