mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-01 14:40:25 +02:00
Reverted accidental commit.
git-svn-id: trunk@12347 -
This commit is contained in:
parent
edf8ab52ef
commit
7f32d1a1d3
37
Makefile
37
Makefile
@ -1069,6 +1069,37 @@ endif
|
|||||||
else
|
else
|
||||||
CROSSBINDIR=
|
CROSSBINDIR=
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS_SOURCE),linux)
|
||||||
|
ifndef GCCLIBDIR
|
||||||
|
ifeq ($(CPU_TARGET),i386)
|
||||||
|
ifneq ($(findstring x86_64,$(shell uname -a)),)
|
||||||
|
ifeq ($(BINUTILSPREFIX),)
|
||||||
|
GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifeq ($(CPU_TARGET),powerpc64)
|
||||||
|
ifeq ($(BINUTILSPREFIX),)
|
||||||
|
GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifndef GCCLIBDIR
|
||||||
|
CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
|
||||||
|
ifneq ($(CROSSGCC),)
|
||||||
|
GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifndef OTHERLIBDIR
|
||||||
|
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifdef inUnix
|
||||||
|
ifeq ($(OS_SOURCE),netbsd)
|
||||||
|
OTHERLIBDIR+=/usr/pkg/lib
|
||||||
|
endif
|
||||||
|
export GCCLIBDIR OTHERLIB
|
||||||
|
endif
|
||||||
BATCHEXT=.bat
|
BATCHEXT=.bat
|
||||||
LOADEREXT=.as
|
LOADEREXT=.as
|
||||||
EXEEXT=.exe
|
EXEEXT=.exe
|
||||||
@ -2760,6 +2791,12 @@ endif
|
|||||||
endif
|
endif
|
||||||
ifdef LINKSHARED
|
ifdef LINKSHARED
|
||||||
endif
|
endif
|
||||||
|
ifdef GCCLIBDIR
|
||||||
|
override FPCOPT+=-Fl$(GCCLIBDIR)
|
||||||
|
endif
|
||||||
|
ifdef OTHERLIBDIR
|
||||||
|
override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
|
||||||
|
endif
|
||||||
ifdef OPT
|
ifdef OPT
|
||||||
override FPCOPT+=$(OPT)
|
override FPCOPT+=$(OPT)
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user