mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-11 21:46:00 +02:00
- remove ld.so.conf parsing from makefiles: this was probably done because we
used to completely replace the default linker script under Linux (which also includes search directories), and it's wrong in case of cross-compiling git-svn-id: trunk@44860 -
This commit is contained in:
parent
0df2c867ca
commit
f81dac4f6f
File diff suppressed because it is too large
Load Diff
@ -850,18 +850,13 @@ ifneq ($(CROSSGCC),)
|
|||||||
GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
|
GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Other libraries from ld.so.conf
|
|
||||||
ifndef OTHERLIBDIR
|
|
||||||
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef inUnix
|
ifdef inUnix
|
||||||
ifeq ($(OS_SOURCE),netbsd)
|
ifeq ($(OS_SOURCE),netbsd)
|
||||||
OTHERLIBDIR+=/usr/pkg/lib
|
OTHERLIBDIR:=/usr/pkg/lib
|
||||||
endif
|
endif
|
||||||
export GCCLIBDIR OTHERLIB
|
export GCCLIBDIR OTHERLIBDIR
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user