* search libs in %basepath%/lib/$FPCTARGET by default, so FPC can install libs if needed

git-svn-id: trunk@19983 -
This commit is contained in:
florian 2012-01-06 16:43:17 +00:00
parent d1be2e7907
commit 088ddf7421
2 changed files with 15 additions and 14 deletions

View File

@ -162,6 +162,7 @@
# searchpath for libraries # searchpath for libraries
#-Fl%basepath%/lib #-Fl%basepath%/lib
#-Fl/lib;/usr/lib #-Fl/lib;/usr/lib
-Fl%basepath%/lib/$FPCTARGET
# searchpath for tools # searchpath for tools
-FD%basepath%/bin/$FPCTARGET -FD%basepath%/bin/$FPCTARGET

View File

@ -182,14 +182,15 @@ const DefaultConfig : array[0..26,1..240] of char=(
'# searchpath for libraries'#013#010+ '# searchpath for libraries'#013#010+
'#-Fl%basepath%/lib'#013#010+ '#-Fl%basepath%/lib'#013#010+
'#-Fl/lib;/usr/lib'#013#010+ '#-Fl/lib;/usr/lib'#013#010+
'-Fl%basepath%/lib/$FPCTARGET'#013#010+
#013#010+ #013#010+
'# searchpath for tools'#013#010+ '# searchpath for tools'#013#010+
'-FD%basepath%/bin/$FPCTARGET'#013#010+ '-FD%basepath%/bin/$FPCTARGET'#013#010+
#013#010+ #013#010+
'%NEEDCROSSBINUTILSIFDEF%'#013#010+ '%NEEDCROSSBINUTILSIFDEF%'#013#010+
#013#010+ #013#010+
'# binutils prefix for cross compiling'#013#010+ '# binutils prefix for cross compi','ling'#013#010+
'#IFDEF FPC_CROSSCOMPILIN','G'#013#010+ '#IFDEF FPC_CROSSCOMPILING'#013#010+
'#IFDEF NEEDCROSSBINUTILS'#013#010+ '#IFDEF NEEDCROSSBINUTILS'#013#010+
' -XP$FPCTARGET-'#013#010+ ' -XP$FPCTARGET-'#013#010+
'#ENDIF'#013#010+ '#ENDIF'#013#010+
@ -203,13 +204,13 @@ const DefaultConfig : array[0..26,1..240] of char=(
'# generate always debugging information for GDB (slows down the compil'+ '# generate always debugging information for GDB (slows down the compil'+
'ing'#013#010+ 'ing'#013#010+
'# process)'#013#010+ '# process)'#013#010+
'# -gc generate checks for p','ointers'#013#010+ '# -g','c generate checks for pointers'#013#010+
'# -gd use dbx'#013#010+ '# -gd use dbx'#013#010+
'# -gg use gsym'#013#010+ '# -gg use gsym'#013#010+
'# -gh use heap trace unit (for memory leak debugging)'#013#010+ '# -gh use heap trace unit (for memory leak debugging)'#013#010+
'# -gl use line info unit to show more info for backtraces'#013+ '# -gl use line info unit to show more info for backtraces'#013+
#010+ #010+
'# -gv generates programs t','racable with valgrind'#013#010+ '# -','gv generates programs tracable with valgrind'#013#010+
'# -gw generate dwarf debugging info'#013#010+ '# -gw generate dwarf debugging info'#013#010+
'#'#013#010+ '#'#013#010+
'# Enable debuginfo and use the line info unit by default'#013#010+ '# Enable debuginfo and use the line info unit by default'#013#010+
@ -218,8 +219,8 @@ const DefaultConfig : array[0..26,1..240] of char=(
'# always pass an option to the linker'#013#010+ '# always pass an option to the linker'#013#010+
'#-k-s'#013#010+ '#-k-s'#013#010+
#013#010+ #013#010+
'# Always strip debuginfo from the executable'#013#010+ '# Always strip debugi','nfo from the executable'#013#010+
'-Xs'#013#010, '-Xs'#013#010+
#013#010+ #013#010+
#013#010+ #013#010+
'# -------------'#013#010+ '# -------------'#013#010+
@ -231,20 +232,19 @@ const DefaultConfig : array[0..26,1..240] of char=(
#013#010+ #013#010+
'# Verbosity'#013#010+ '# Verbosity'#013#010+
'# e : Show errors (default) d : Show debug info'#013#010+ '# e : Show errors (default) d : Show debug info'#013#010+
'# w : Show warnings u : Show unit info'#013#010+ '# w : Show warnings ','u : Show unit info'#013#010+
'# n :',' Show notes t : Show tried/used files'#013+ '# n : Show notes t : Show tried/used files'#013#010+
#010+
'# h : Show hints s : Show time stamps'#013#010+ '# h : Show hints s : Show time stamps'#013#010+
'# i : Show general info q : Show message numbers'#013#010+ '# i : Show general info q : Show message numbers'#013#010+
'# l : Show linenumbers c : Show conditiona','ls'#013#010+ '# l : Show linenumbers ',' c : Show conditionals'#013#010+
'# a : Show everything 0 : Show nothing (except errors'+ '# a : Show everything 0 : Show nothing (except errors'+
')'#013#010+ ')'#013#010+
'# b : Write file names messages r : Rhide/GCC compatibility mod'+ '# b : Write file names messages r : Rhide/GCC compatibility mod'+
'e'#013#010+ 'e'#013#010+
'# with full path x : Executable info (Win32 only'+ '# with full path x : Executable info (','Win32 on'+
')'#013#010+ 'ly)'#013#010+
'# v : write ','fpcdebug.txt with p : Write tree.log with parse'+ '# v : write fpcdebug.txt with p : Write tree.log with parse t'+
' tree'#013#010+ 'ree'#013#010+
'# lots of debugging info'#013#010+ '# lots of debugging info'#013#010+
'#'#013#010+ '#'#013#010+
'# Display Info, Warnings and Notes'#013#010+ '# Display Info, Warnings and Notes'#013#010+