diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-18 16:08:25 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-18 16:08:25 +0000 |
| commit | 8668d1d4b544aedbc76fe2adca2484ee56ea869f (patch) | |
| tree | b544c36505a4ca95f4b2acccb030f09b021250c9 /rtl/solaris | |
| parent | 0bc3a971baf972f2fd4d96e1c0dfbf90b896b9fc (diff) | |
| download | fpc-8668d1d4b544aedbc76fe2adca2484ee56ea869f.tar.gz | |
* regenerated makefiles
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@44793 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl/solaris')
| -rw-r--r-- | rtl/solaris/Makefile | 47 |
1 files changed, 38 insertions, 9 deletions
diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index a9950d7077..6ca5612358 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -1979,6 +1979,37 @@ endif else CROSSBINDIR= 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 LOADEREXT=.as EXEEXT=.exe @@ -2500,16 +2531,7 @@ override FPCOPT+=-gl override FPCOPTDEF+=DEBUG endif ifdef RELEASE -ifneq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(CPU_TARGET),i386) -FPCCPUOPT:=-OG2p3 -endif -ifeq ($(CPU_TARGET),powerpc) -FPCCPUOPT:=-O1r -endif -else FPCCPUOPT:=-O2 -endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE endif @@ -2571,6 +2593,13 @@ endif endif ifdef LINKSHARED endif +ifdef GCCLIBDIR +override FPCOPT+=-Fl$(GCCLIBDIR) +override FPCMAKEOPT+=-Fl$(GCCLIBDIR) +endif +ifdef OTHERLIBDIR +override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR)) +endif ifdef OPT override FPCOPT+=$(OPT) endif |