diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-19 17:33:47 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-19 17:33:47 +0000 |
| commit | 9f11549dcbf69a8816c6f8aa7d1b456d49428a53 (patch) | |
| tree | 477faf87bc56ef5b28633ff8e662965ae70ab5c3 | |
| parent | 81fab2d62680c20e1c66eb2785fa0310dbe60d7c (diff) | |
| download | fpc-9f11549dcbf69a8816c6f8aa7d1b456d49428a53.tar.gz | |
* regenerated makefiles
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@44861 3ad0048d-3df7-0310-abae-a5850022a9f2
445 files changed, 3542 insertions, 2225 deletions
@@ -999,15 +999,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/compiler/Makefile b/compiler/Makefile index 7e8fb2333e..eef17d9c14 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2545,15 +2551,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/compiler/utils/Makefile b/compiler/utils/Makefile index 5b2d2674cd..1b916f76b1 100644 --- a/compiler/utils/Makefile +++ b/compiler/utils/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1689,15 +1695,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/installer/Makefile b/installer/Makefile index 61659c429d..651d70e0e2 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -945,15 +951,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/Makefile b/packages/Makefile index ba4bb4c54f..135a09e0fe 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -587,15 +587,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/a52/Makefile b/packages/a52/Makefile index e2aec99877..8572f1160a 100644 --- a/packages/a52/Makefile +++ b/packages/a52/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ami-extra/Makefile b/packages/ami-extra/Makefile index a25516b38d..107791e883 100644 --- a/packages/ami-extra/Makefile +++ b/packages/ami-extra/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/amunits/Makefile b/packages/amunits/Makefile index 7f2ae56c27..7da7e66b8c 100644 --- a/packages/amunits/Makefile +++ b/packages/amunits/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/arosunits/Makefile b/packages/arosunits/Makefile index bb507b48ca..b4a4e4c6cb 100644 --- a/packages/arosunits/Makefile +++ b/packages/arosunits/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/aspell/Makefile b/packages/aspell/Makefile index 268b7fe35e..2054a8db1b 100644 --- a/packages/aspell/Makefile +++ b/packages/aspell/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/bfd/Makefile b/packages/bfd/Makefile index c1e271bed5..daa2157f45 100644 --- a/packages/bfd/Makefile +++ b/packages/bfd/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/bzip2/Makefile b/packages/bzip2/Makefile index 6ac2f8fa91..d297ffc194 100644 --- a/packages/bzip2/Makefile +++ b/packages/bzip2/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/cairo/Makefile b/packages/cairo/Makefile index ac6205a1b2..292a525f0d 100644 --- a/packages/cairo/Makefile +++ b/packages/cairo/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/cdrom/Makefile b/packages/cdrom/Makefile index 95ccc12852..9cac80d25b 100644 --- a/packages/cdrom/Makefile +++ b/packages/cdrom/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/cdrom/examples/Makefile b/packages/cdrom/examples/Makefile index 060a4d16d3..4c7156c3ee 100644 --- a/packages/cdrom/examples/Makefile +++ b/packages/cdrom/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/chm/Makefile b/packages/chm/Makefile index 008bd06577..4f2e7c7602 100644 --- a/packages/chm/Makefile +++ b/packages/chm/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/cocoaint/Makefile b/packages/cocoaint/Makefile index 46d8a8db76..39cbfa08b2 100644 --- a/packages/cocoaint/Makefile +++ b/packages/cocoaint/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/dblib/Makefile b/packages/dblib/Makefile index 6477915f01..1984310975 100644 --- a/packages/dblib/Makefile +++ b/packages/dblib/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/dbus/Makefile b/packages/dbus/Makefile index caf2127fdf..13cfd576ab 100644 --- a/packages/dbus/Makefile +++ b/packages/dbus/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/dbus/examples/Makefile b/packages/dbus/examples/Makefile index 193089f9ac..96d36424a3 100644 --- a/packages/dbus/examples/Makefile +++ b/packages/dbus/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/dts/Makefile b/packages/dts/Makefile index 0ed84ae2e6..bfed22d667 100644 --- a/packages/dts/Makefile +++ b/packages/dts/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fastcgi/Makefile b/packages/fastcgi/Makefile index 3869bdd376..35e619ca7b 100644 --- a/packages/fastcgi/Makefile +++ b/packages/fastcgi/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-async/Makefile b/packages/fcl-async/Makefile index 76a7c87d6a..2f398907de 100644 --- a/packages/fcl-async/Makefile +++ b/packages/fcl-async/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-base/Makefile b/packages/fcl-base/Makefile index b1c9379eaf..bbc7cf1af3 100644 --- a/packages/fcl-base/Makefile +++ b/packages/fcl-base/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-base/examples/Makefile b/packages/fcl-base/examples/Makefile index eaef2c3ab0..407b984bbb 100644 --- a/packages/fcl-base/examples/Makefile +++ b/packages/fcl-base/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile index edc778b495..12f68239cb 100644 --- a/packages/fcl-db/Makefile +++ b/packages/fcl-db/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/base/Makefile b/packages/fcl-db/src/base/Makefile index d33fefa8fc..6314940004 100644 --- a/packages/fcl-db/src/base/Makefile +++ b/packages/fcl-db/src/base/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1690,15 +1696,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/codegen/Makefile b/packages/fcl-db/src/codegen/Makefile index b66f1af3e0..9f5ff381a5 100644 --- a/packages/fcl-db/src/codegen/Makefile +++ b/packages/fcl-db/src/codegen/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/datadict/Makefile b/packages/fcl-db/src/datadict/Makefile index eebf9ad47c..fae4615ea9 100644 --- a/packages/fcl-db/src/datadict/Makefile +++ b/packages/fcl-db/src/datadict/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/dbase/Makefile b/packages/fcl-db/src/dbase/Makefile index e5bb29305a..19aeb7a86f 100644 --- a/packages/fcl-db/src/dbase/Makefile +++ b/packages/fcl-db/src/dbase/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1982,15 +1988,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/export/Makefile b/packages/fcl-db/src/export/Makefile index 35ba879181..ef4171c02f 100644 --- a/packages/fcl-db/src/export/Makefile +++ b/packages/fcl-db/src/export/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/json/Makefile b/packages/fcl-db/src/json/Makefile index 96c7428bdf..4f256bd7c3 100644 --- a/packages/fcl-db/src/json/Makefile +++ b/packages/fcl-db/src/json/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -834,15 +840,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/memds/Makefile b/packages/fcl-db/src/memds/Makefile index 6fd33aa2c5..6d031564bd 100644 --- a/packages/fcl-db/src/memds/Makefile +++ b/packages/fcl-db/src/memds/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/paradox/Makefile b/packages/fcl-db/src/paradox/Makefile index 3391ac4061..60b1625cae 100644 --- a/packages/fcl-db/src/paradox/Makefile +++ b/packages/fcl-db/src/paradox/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sdf/Makefile b/packages/fcl-db/src/sdf/Makefile index 7cbb7008bc..b9777a2d8c 100644 --- a/packages/fcl-db/src/sdf/Makefile +++ b/packages/fcl-db/src/sdf/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sql/Makefile b/packages/fcl-db/src/sql/Makefile index ea8616a8c2..5135574bbe 100644 --- a/packages/fcl-db/src/sql/Makefile +++ b/packages/fcl-db/src/sql/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1689,15 +1695,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/Makefile b/packages/fcl-db/src/sqldb/Makefile index bd2b8e241f..86a11e78d5 100644 --- a/packages/fcl-db/src/sqldb/Makefile +++ b/packages/fcl-db/src/sqldb/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1524,15 +1530,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/interbase/Makefile b/packages/fcl-db/src/sqldb/interbase/Makefile index da14723f86..f960f5088e 100644 --- a/packages/fcl-db/src/sqldb/interbase/Makefile +++ b/packages/fcl-db/src/sqldb/interbase/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/mssql/Makefile b/packages/fcl-db/src/sqldb/mssql/Makefile index 55d931f6e4..b6a47fb880 100644 --- a/packages/fcl-db/src/sqldb/mssql/Makefile +++ b/packages/fcl-db/src/sqldb/mssql/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile b/packages/fcl-db/src/sqldb/mysql/Makefile index ba1023cfff..2ddd88adc3 100644 --- a/packages/fcl-db/src/sqldb/mysql/Makefile +++ b/packages/fcl-db/src/sqldb/mysql/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/odbc/Makefile b/packages/fcl-db/src/sqldb/odbc/Makefile index 5735c7b5df..ce7aabe9e8 100644 --- a/packages/fcl-db/src/sqldb/odbc/Makefile +++ b/packages/fcl-db/src/sqldb/odbc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/oracle/Makefile b/packages/fcl-db/src/sqldb/oracle/Makefile index d6f7ffc831..afaa41c55c 100644 --- a/packages/fcl-db/src/sqldb/oracle/Makefile +++ b/packages/fcl-db/src/sqldb/oracle/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/postgres/Makefile b/packages/fcl-db/src/sqldb/postgres/Makefile index a1789ff09f..a7f2ef978b 100644 --- a/packages/fcl-db/src/sqldb/postgres/Makefile +++ b/packages/fcl-db/src/sqldb/postgres/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqldb/sqlite/Makefile b/packages/fcl-db/src/sqldb/sqlite/Makefile index b8ff9e1ada..5545d6de7c 100644 --- a/packages/fcl-db/src/sqldb/sqlite/Makefile +++ b/packages/fcl-db/src/sqldb/sqlite/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/src/sqlite/Makefile b/packages/fcl-db/src/sqlite/Makefile index 2f764a9988..028928b3b7 100644 --- a/packages/fcl-db/src/sqlite/Makefile +++ b/packages/fcl-db/src/sqlite/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -834,15 +840,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-db/tests/Makefile b/packages/fcl-db/tests/Makefile index ce1a96e60c..c9f700169a 100644 --- a/packages/fcl-db/tests/Makefile +++ b/packages/fcl-db/tests/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-extra/Makefile b/packages/fcl-extra/Makefile index 533be91b74..0b77b2c531 100644 --- a/packages/fcl-extra/Makefile +++ b/packages/fcl-extra/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-extra/examples/Makefile b/packages/fcl-extra/examples/Makefile index 9a58a856c1..39a915d768 100644 --- a/packages/fcl-extra/examples/Makefile +++ b/packages/fcl-extra/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -661,15 +667,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-fpcunit/Makefile b/packages/fcl-fpcunit/Makefile index d3fcaec108..bda794b994 100644 --- a/packages/fcl-fpcunit/Makefile +++ b/packages/fcl-fpcunit/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-fpcunit/src/exampletests/Makefile b/packages/fcl-fpcunit/src/exampletests/Makefile index 7e573fa990..9e39feda3f 100644 --- a/packages/fcl-fpcunit/src/exampletests/Makefile +++ b/packages/fcl-fpcunit/src/exampletests/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-fpcunit/src/tests/Makefile b/packages/fcl-fpcunit/src/tests/Makefile index c89dc49753..9fe1158fb7 100644 --- a/packages/fcl-fpcunit/src/tests/Makefile +++ b/packages/fcl-fpcunit/src/tests/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1119,15 +1125,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-image/Makefile b/packages/fcl-image/Makefile index 6d9cd99546..57d6442d09 100644 --- a/packages/fcl-image/Makefile +++ b/packages/fcl-image/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-image/examples/Makefile b/packages/fcl-image/examples/Makefile index ea88800acc..a3deea72ec 100644 --- a/packages/fcl-image/examples/Makefile +++ b/packages/fcl-image/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-js/Makefile b/packages/fcl-js/Makefile index c8aa12fe3d..98c03b9b04 100644 --- a/packages/fcl-js/Makefile +++ b/packages/fcl-js/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-json/Makefile b/packages/fcl-json/Makefile index f4eea94d6d..fc94bf6b30 100644 --- a/packages/fcl-json/Makefile +++ b/packages/fcl-json/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile index bdb6b6cdd7..f80893844a 100644 --- a/packages/fcl-net/Makefile +++ b/packages/fcl-net/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-net/examples/Makefile b/packages/fcl-net/examples/Makefile index be246be62d..cc0f462bbb 100644 --- a/packages/fcl-net/examples/Makefile +++ b/packages/fcl-net/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1402,15 +1408,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-passrc/Makefile b/packages/fcl-passrc/Makefile index bb360ce831..ff1024dea6 100644 --- a/packages/fcl-passrc/Makefile +++ b/packages/fcl-passrc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-pdf/Makefile b/packages/fcl-pdf/Makefile index 4954bfb340..aced7e2c2e 100644 --- a/packages/fcl-pdf/Makefile +++ b/packages/fcl-pdf/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -581,15 +587,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-process/Makefile b/packages/fcl-process/Makefile index 4bade3eb00..e801942477 100644 --- a/packages/fcl-process/Makefile +++ b/packages/fcl-process/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -581,15 +587,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-registry/Makefile b/packages/fcl-registry/Makefile index c58b8a108f..e384a34371 100644 --- a/packages/fcl-registry/Makefile +++ b/packages/fcl-registry/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-registry/tests/Makefile b/packages/fcl-registry/tests/Makefile index 9e9a1b5de5..04b28de62f 100644 --- a/packages/fcl-registry/tests/Makefile +++ b/packages/fcl-registry/tests/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -834,15 +840,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-report/Makefile b/packages/fcl-report/Makefile index 74fb05b30c..a8b4e94e13 100644 --- a/packages/fcl-report/Makefile +++ b/packages/fcl-report/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-res/Makefile b/packages/fcl-res/Makefile index 3d618c0ed9..a14cf9c075 100644 --- a/packages/fcl-res/Makefile +++ b/packages/fcl-res/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-sdo/Makefile b/packages/fcl-sdo/Makefile index 90492458af..4cf81414bb 100644 --- a/packages/fcl-sdo/Makefile +++ b/packages/fcl-sdo/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-sound/Makefile b/packages/fcl-sound/Makefile index 1193a1d43c..8b82d2b60c 100644 --- a/packages/fcl-sound/Makefile +++ b/packages/fcl-sound/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-stl/Makefile b/packages/fcl-stl/Makefile index c131bffc0b..6d285c6389 100644 --- a/packages/fcl-stl/Makefile +++ b/packages/fcl-stl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile index d0536a7ba3..811722532d 100644 --- a/packages/fcl-web/Makefile +++ b/packages/fcl-web/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-web/src/base/Makefile b/packages/fcl-web/src/base/Makefile index 7ae0096d1b..55f0d81056 100644 --- a/packages/fcl-web/src/base/Makefile +++ b/packages/fcl-web/src/base/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1405,15 +1411,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-web/src/jsonrpc/Makefile b/packages/fcl-web/src/jsonrpc/Makefile index 0bff87efc3..b56c1ceb88 100644 --- a/packages/fcl-web/src/jsonrpc/Makefile +++ b/packages/fcl-web/src/jsonrpc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1120,15 +1126,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-web/src/webdata/Makefile b/packages/fcl-web/src/webdata/Makefile index d6c8cb2429..a6b6367b6f 100644 --- a/packages/fcl-web/src/webdata/Makefile +++ b/packages/fcl-web/src/webdata/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1120,15 +1126,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile index 18d40b241f..2e0a7e3cdb 100644 --- a/packages/fcl-xml/Makefile +++ b/packages/fcl-xml/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fftw/Makefile b/packages/fftw/Makefile index b5811e0db7..ff2df0e066 100644 --- a/packages/fftw/Makefile +++ b/packages/fftw/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fpgtk/Makefile b/packages/fpgtk/Makefile index 05679f8874..879449012d 100644 --- a/packages/fpgtk/Makefile +++ b/packages/fpgtk/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fpgtk/examples/Makefile b/packages/fpgtk/examples/Makefile index 566bb5ea8e..0971d0fa25 100644 --- a/packages/fpgtk/examples/Makefile +++ b/packages/fpgtk/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fpindexer/Makefile b/packages/fpindexer/Makefile index 98846ce376..7d659b1c73 100644 --- a/packages/fpindexer/Makefile +++ b/packages/fpindexer/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile index eddbdccd22..2c78aeaa54 100644 --- a/packages/fpmkunit/Makefile +++ b/packages/fpmkunit/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -600,15 +606,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fppkg/Makefile b/packages/fppkg/Makefile index b611ceab18..9889b3accf 100644 --- a/packages/fppkg/Makefile +++ b/packages/fppkg/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fuse/Makefile b/packages/fuse/Makefile index c8a070700a..dc02cc9e04 100644 --- a/packages/fuse/Makefile +++ b/packages/fuse/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fv/Makefile b/packages/fv/Makefile index f79623bc36..2aba03a634 100644 --- a/packages/fv/Makefile +++ b/packages/fv/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/fv/examples/Makefile b/packages/fv/examples/Makefile index 7bbc5ae74d..810f304d2e 100644 --- a/packages/fv/examples/Makefile +++ b/packages/fv/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1116,15 +1122,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 5fd2a8b20e..4fe93a64e8 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gdbm/Makefile b/packages/gdbm/Makefile index 6e5a66eda6..147c469420 100644 --- a/packages/gdbm/Makefile +++ b/packages/gdbm/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gdbm/examples/Makefile b/packages/gdbm/examples/Makefile index 8896f18b30..e78a99ed85 100644 --- a/packages/gdbm/examples/Makefile +++ b/packages/gdbm/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index 5f52147804..882c9c4a0b 100644 --- a/packages/ggi/Makefile +++ b/packages/ggi/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ggi/examples/Makefile b/packages/ggi/examples/Makefile index e82c64ce4a..66c1edeb9e 100644 --- a/packages/ggi/examples/Makefile +++ b/packages/ggi/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gmp/Makefile b/packages/gmp/Makefile index 6bdd15e033..ff7aa7b025 100644 --- a/packages/gmp/Makefile +++ b/packages/gmp/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gmp/examples/Makefile b/packages/gmp/examples/Makefile index e2e89cc412..b3d31a4843 100644 --- a/packages/gmp/examples/Makefile +++ b/packages/gmp/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gnome1/Makefile b/packages/gnome1/Makefile index b4a45e655e..1c4134df75 100644 --- a/packages/gnome1/Makefile +++ b/packages/gnome1/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gnutls/Makefile b/packages/gnutls/Makefile index 5828cca216..f6c1363638 100644 --- a/packages/gnutls/Makefile +++ b/packages/gnutls/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/googleapi/Makefile b/packages/googleapi/Makefile index 01720d24b6..5873e6026d 100644 --- a/packages/googleapi/Makefile +++ b/packages/googleapi/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/graph/Makefile b/packages/graph/Makefile index f0f9ced260..c2ebf895ae 100644 --- a/packages/graph/Makefile +++ b/packages/graph/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk1/Makefile b/packages/gtk1/Makefile index e8d58820a1..6314fb5b29 100644 --- a/packages/gtk1/Makefile +++ b/packages/gtk1/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk1/examples/Makefile b/packages/gtk1/examples/Makefile index 3a9a39d5e2..adac321622 100644 --- a/packages/gtk1/examples/Makefile +++ b/packages/gtk1/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1402,15 +1408,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk1/examples/tutorial/Makefile b/packages/gtk1/examples/tutorial/Makefile index ddba7809f6..e1eefe75df 100644 --- a/packages/gtk1/examples/tutorial/Makefile +++ b/packages/gtk1/examples/tutorial/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -547,15 +553,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk1/src/gtkgl/Makefile b/packages/gtk1/src/gtkgl/Makefile index 84fd140875..8cc81cc0c5 100644 --- a/packages/gtk1/src/gtkgl/Makefile +++ b/packages/gtk1/src/gtkgl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1121,15 +1127,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/Makefile b/packages/gtk2/Makefile index c54dd02a38..6d358d566e 100644 --- a/packages/gtk2/Makefile +++ b/packages/gtk2/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/Makefile b/packages/gtk2/examples/Makefile index 6108b14d8a..c0a4734301 100644 --- a/packages/gtk2/examples/Makefile +++ b/packages/gtk2/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/filechooser/Makefile b/packages/gtk2/examples/filechooser/Makefile index 20a8483009..6ad68ea7dc 100644 --- a/packages/gtk2/examples/filechooser/Makefile +++ b/packages/gtk2/examples/filechooser/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/gettingstarted/Makefile b/packages/gtk2/examples/gettingstarted/Makefile index efafd3695b..9958e94552 100644 --- a/packages/gtk2/examples/gettingstarted/Makefile +++ b/packages/gtk2/examples/gettingstarted/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/gtk_demo/Makefile b/packages/gtk2/examples/gtk_demo/Makefile index bfcf0bda6c..70e8ac78ab 100644 --- a/packages/gtk2/examples/gtk_demo/Makefile +++ b/packages/gtk2/examples/gtk_demo/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/gtkglext/Makefile b/packages/gtk2/examples/gtkglext/Makefile index dba2fcc490..2555f87bbf 100644 --- a/packages/gtk2/examples/gtkglext/Makefile +++ b/packages/gtk2/examples/gtkglext/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/helloworld/Makefile b/packages/gtk2/examples/helloworld/Makefile index 76d7b332c2..f9c3f7b872 100644 --- a/packages/gtk2/examples/helloworld/Makefile +++ b/packages/gtk2/examples/helloworld/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/helloworld2/Makefile b/packages/gtk2/examples/helloworld2/Makefile index a8a0607c9a..575a6f0d7c 100644 --- a/packages/gtk2/examples/helloworld2/Makefile +++ b/packages/gtk2/examples/helloworld2/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/plugins/Makefile b/packages/gtk2/examples/plugins/Makefile index 96c1de3480..327ee11fc5 100644 --- a/packages/gtk2/examples/plugins/Makefile +++ b/packages/gtk2/examples/plugins/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/gtk2/examples/scribble_simple/Makefile b/packages/gtk2/examples/scribble_simple/Makefile index 1a318dbf31..7036661383 100644 --- a/packages/gtk2/examples/scribble_simple/Makefile +++ b/packages/gtk2/examples/scribble_simple/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/hash/Makefile b/packages/hash/Makefile index 2ec98a51d4..8bfc6635fe 100644 --- a/packages/hash/Makefile +++ b/packages/hash/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -581,15 +587,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/hash/examples/Makefile b/packages/hash/examples/Makefile index e8d5bc91bb..654a51381b 100644 --- a/packages/hash/examples/Makefile +++ b/packages/hash/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/hermes/Makefile b/packages/hermes/Makefile index 08e486ee66..4acc71cdb0 100644 --- a/packages/hermes/Makefile +++ b/packages/hermes/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/httpd13/Makefile b/packages/httpd13/Makefile index 50007d0616..6535a2fffe 100644 --- a/packages/httpd13/Makefile +++ b/packages/httpd13/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/httpd20/Makefile b/packages/httpd20/Makefile index 7f9358265f..462280efc3 100644 --- a/packages/httpd20/Makefile +++ b/packages/httpd20/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/httpd20/examples/Makefile b/packages/httpd20/examples/Makefile index 019fc72a8f..ef26b74fa5 100644 --- a/packages/httpd20/examples/Makefile +++ b/packages/httpd20/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/httpd22/Makefile b/packages/httpd22/Makefile index 0b7a1f577b..215e1f79f1 100644 --- a/packages/httpd22/Makefile +++ b/packages/httpd22/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/httpd22/examples/Makefile b/packages/httpd22/examples/Makefile index 14a51e175b..4bb101372b 100644 --- a/packages/httpd22/examples/Makefile +++ b/packages/httpd22/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/httpd24/Makefile b/packages/httpd24/Makefile index 6d0d4e29d8..0bb2431410 100644 --- a/packages/httpd24/Makefile +++ b/packages/httpd24/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/httpd24/examples/Makefile b/packages/httpd24/examples/Makefile index 61aa734fe3..a5ad3904d6 100644 --- a/packages/httpd24/examples/Makefile +++ b/packages/httpd24/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index bb066d2f50..88e6f9a82d 100644 --- a/packages/ibase/Makefile +++ b/packages/ibase/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ibase/examples/Makefile b/packages/ibase/examples/Makefile index 485f9d791a..350f74e098 100644 --- a/packages/ibase/examples/Makefile +++ b/packages/ibase/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/iconvenc/Makefile b/packages/iconvenc/Makefile index 6d7fb62128..ec740f8528 100644 --- a/packages/iconvenc/Makefile +++ b/packages/iconvenc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/iconvenc/examples/Makefile b/packages/iconvenc/examples/Makefile index ed55fa93c3..6df1a8e9d2 100644 --- a/packages/iconvenc/examples/Makefile +++ b/packages/iconvenc/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ide/Makefile b/packages/ide/Makefile index 0a862b1894..44c4c54f05 100644 --- a/packages/ide/Makefile +++ b/packages/ide/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -566,15 +572,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ide/compiler/Makefile b/packages/ide/compiler/Makefile index 9abfa868ed..d716c97e0f 100644 --- a/packages/ide/compiler/Makefile +++ b/packages/ide/compiler/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1726,15 +1732,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ide/fakegdb/Makefile b/packages/ide/fakegdb/Makefile index f81f7377a1..3923ee9b1b 100644 --- a/packages/ide/fakegdb/Makefile +++ b/packages/ide/fakegdb/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -834,15 +840,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/imagemagick/Makefile b/packages/imagemagick/Makefile index 419ec89b23..0c7e48ed75 100644 --- a/packages/imagemagick/Makefile +++ b/packages/imagemagick/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/imlib/Makefile b/packages/imlib/Makefile index 153f114f62..2ede2b3f4d 100644 --- a/packages/imlib/Makefile +++ b/packages/imlib/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/iosxlocale/Makefile b/packages/iosxlocale/Makefile index 25c2dd8bde..b2e2b6d511 100644 --- a/packages/iosxlocale/Makefile +++ b/packages/iosxlocale/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/jni/Makefile b/packages/jni/Makefile index c150ece86f..f25c2b9804 100644 --- a/packages/jni/Makefile +++ b/packages/jni/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ldap/Makefile b/packages/ldap/Makefile index e49a07ba39..f1cc74c7ff 100644 --- a/packages/ldap/Makefile +++ b/packages/ldap/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libc/Makefile b/packages/libc/Makefile index cf0ab2be8e..c609351cc0 100644 --- a/packages/libc/Makefile +++ b/packages/libc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libcups/Makefile b/packages/libcups/Makefile index 44e3aab1b0..ed031ea977 100644 --- a/packages/libcups/Makefile +++ b/packages/libcups/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libcurl/Makefile b/packages/libcurl/Makefile index 24d99e176b..bfe060863f 100644 --- a/packages/libcurl/Makefile +++ b/packages/libcurl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libcurl/examples/Makefile b/packages/libcurl/examples/Makefile index e2ad589165..76c1ebafb9 100644 --- a/packages/libcurl/examples/Makefile +++ b/packages/libcurl/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libenet/Makefile b/packages/libenet/Makefile index cb042cc6d4..a0b23bc546 100644 --- a/packages/libenet/Makefile +++ b/packages/libenet/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libffi/Makefile b/packages/libffi/Makefile index 4dc2c3e665..4b62d6c5a7 100644 --- a/packages/libffi/Makefile +++ b/packages/libffi/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libfontconfig/Makefile b/packages/libfontconfig/Makefile index a53730b3b1..9aacdccfa9 100644 --- a/packages/libfontconfig/Makefile +++ b/packages/libfontconfig/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/Makefile b/packages/libgbafpc/Makefile index 251ca968d8..57073d25f0 100644 --- a/packages/libgbafpc/Makefile +++ b/packages/libgbafpc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/Makefile b/packages/libgbafpc/examples/Makefile index 7a640e6da1..574829fc79 100644 --- a/packages/libgbafpc/examples/Makefile +++ b/packages/libgbafpc/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/audio/Makefile b/packages/libgbafpc/examples/audio/Makefile index 72e8a86412..e1cd439aeb 100644 --- a/packages/libgbafpc/examples/audio/Makefile +++ b/packages/libgbafpc/examples/audio/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -834,15 +840,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/audio/PlayBoyScout/Makefile b/packages/libgbafpc/examples/audio/PlayBoyScout/Makefile index 627536b02f..5016dc626d 100644 --- a/packages/libgbafpc/examples/audio/PlayBoyScout/Makefile +++ b/packages/libgbafpc/examples/audio/PlayBoyScout/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1409,15 +1415,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/graphics/Makefile b/packages/libgbafpc/examples/graphics/Makefile index b38686062d..13830578de 100644 --- a/packages/libgbafpc/examples/graphics/Makefile +++ b/packages/libgbafpc/examples/graphics/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -834,15 +840,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/graphics/PCXView/Makefile b/packages/libgbafpc/examples/graphics/PCXView/Makefile index b5b7777c45..45125727e6 100644 --- a/packages/libgbafpc/examples/graphics/PCXView/Makefile +++ b/packages/libgbafpc/examples/graphics/PCXView/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1409,15 +1415,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/graphics/SimpleBGScroll/Makefile b/packages/libgbafpc/examples/graphics/SimpleBGScroll/Makefile index 3b448df50b..2cb4e47bc7 100644 --- a/packages/libgbafpc/examples/graphics/SimpleBGScroll/Makefile +++ b/packages/libgbafpc/examples/graphics/SimpleBGScroll/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1409,15 +1415,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/graphics/ansi_console/Makefile b/packages/libgbafpc/examples/graphics/ansi_console/Makefile index 4f5f5fd357..e5b6c15d7f 100644 --- a/packages/libgbafpc/examples/graphics/ansi_console/Makefile +++ b/packages/libgbafpc/examples/graphics/ansi_console/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1409,15 +1415,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgbafpc/examples/template/Makefile b/packages/libgbafpc/examples/template/Makefile index 1241c7d0fe..aa575e6b8b 100644 --- a/packages/libgbafpc/examples/template/Makefile +++ b/packages/libgbafpc/examples/template/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1411,15 +1417,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgc/Makefile b/packages/libgc/Makefile index 052453d9d9..dde2ad9c80 100644 --- a/packages/libgc/Makefile +++ b/packages/libgc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgd/Makefile b/packages/libgd/Makefile index 4e79efdd0e..4b604e16be 100644 --- a/packages/libgd/Makefile +++ b/packages/libgd/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libgd/examples/Makefile b/packages/libgd/examples/Makefile index b829a1b35f..07fbcc186b 100644 --- a/packages/libgd/examples/Makefile +++ b/packages/libgd/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libmagic/Makefile b/packages/libmagic/Makefile index f3ff055150..defa148ff6 100644 --- a/packages/libmagic/Makefile +++ b/packages/libmagic/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libmicrohttpd/Makefile b/packages/libmicrohttpd/Makefile index c9d7e7e084..712090c189 100644 --- a/packages/libmicrohttpd/Makefile +++ b/packages/libmicrohttpd/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/Makefile b/packages/libndsfpc/Makefile index 0f99474429..140553bb89 100644 --- a/packages/libndsfpc/Makefile +++ b/packages/libndsfpc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/Makefile b/packages/libndsfpc/examples/Makefile index 942210ff8f..7bc5fe758b 100644 --- a/packages/libndsfpc/examples/Makefile +++ b/packages/libndsfpc/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/Makefile b/packages/libndsfpc/examples/audio/Makefile index 2873e27bf2..234c41ee1d 100644 --- a/packages/libndsfpc/examples/audio/Makefile +++ b/packages/libndsfpc/examples/audio/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/maxmod/Makefile b/packages/libndsfpc/examples/audio/maxmod/Makefile index 6c9e1f05d4..0a15a55923 100644 --- a/packages/libndsfpc/examples/audio/maxmod/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile index 0fd343b01c..e612409303 100644 --- a/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/audio_modes/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2554,15 +2560,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile index 6cedbcb590..2a084d9590 100644 --- a/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/basic_sound/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2554,15 +2560,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile index 3e41b6d13b..eb0682d606 100644 --- a/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/reverb/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2554,15 +2560,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile index 1e87ec48ac..ef724b209f 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2554,15 +2560,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile index 52fb703213..93c311e39f 100644 --- a/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/song_events_example2/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2554,15 +2560,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile b/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile index b4ab4c6523..e2b31614b1 100644 --- a/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile +++ b/packages/libndsfpc/examples/audio/maxmod/streaming/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/audio/micrecord/Makefile b/packages/libndsfpc/examples/audio/micrecord/Makefile index 85b23b0d2d..dbc82c3b2b 100644 --- a/packages/libndsfpc/examples/audio/micrecord/Makefile +++ b/packages/libndsfpc/examples/audio/micrecord/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/card/Makefile b/packages/libndsfpc/examples/card/Makefile index e5efb0e133..1b567ec518 100644 --- a/packages/libndsfpc/examples/card/Makefile +++ b/packages/libndsfpc/examples/card/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/card/eeprom/Makefile b/packages/libndsfpc/examples/card/eeprom/Makefile index ea32e26c55..889d6bfcc5 100644 --- a/packages/libndsfpc/examples/card/eeprom/Makefile +++ b/packages/libndsfpc/examples/card/eeprom/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/debugging/Makefile b/packages/libndsfpc/examples/debugging/Makefile index 1ba1ec46bc..b996a2ba8e 100644 --- a/packages/libndsfpc/examples/debugging/Makefile +++ b/packages/libndsfpc/examples/debugging/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile b/packages/libndsfpc/examples/debugging/exceptionTest/Makefile index c11530f213..7bdff4622a 100644 --- a/packages/libndsfpc/examples/debugging/exceptionTest/Makefile +++ b/packages/libndsfpc/examples/debugging/exceptionTest/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/ds_motion/Makefile b/packages/libndsfpc/examples/ds_motion/Makefile index 19a535dac3..2f52187a98 100644 --- a/packages/libndsfpc/examples/ds_motion/Makefile +++ b/packages/libndsfpc/examples/ds_motion/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/dswifi/Makefile b/packages/libndsfpc/examples/dswifi/Makefile index 27f9aba7ed..e1d338c893 100644 --- a/packages/libndsfpc/examples/dswifi/Makefile +++ b/packages/libndsfpc/examples/dswifi/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/dswifi/ap_search/Makefile b/packages/libndsfpc/examples/dswifi/ap_search/Makefile index 1c43026092..38308b8090 100644 --- a/packages/libndsfpc/examples/dswifi/ap_search/Makefile +++ b/packages/libndsfpc/examples/dswifi/ap_search/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile index bc221d91b4..c84f6d9e71 100644 --- a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile +++ b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/dswifi/httpget/Makefile b/packages/libndsfpc/examples/dswifi/httpget/Makefile index f904b4000d..42cfa3988a 100644 --- a/packages/libndsfpc/examples/dswifi/httpget/Makefile +++ b/packages/libndsfpc/examples/dswifi/httpget/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/Makefile b/packages/libndsfpc/examples/filesystem/Makefile index 8203da048d..e96136cfcc 100644 --- a/packages/libndsfpc/examples/filesystem/Makefile +++ b/packages/libndsfpc/examples/filesystem/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile b/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile index b5aa79e905..c01ad65e3f 100644 --- a/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile +++ b/packages/libndsfpc/examples/filesystem/embedded_gbfs/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2553,15 +2559,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/libfat/Makefile b/packages/libndsfpc/examples/filesystem/libfat/Makefile index ea1ca01669..d0eac217cf 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile b/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile index f7af28f38b..f122c063c1 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/access_dir/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile b/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile index bd4b1e3c22..e7b53a6959 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/access_file/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile index b02b178117..0ce4b3f055 100644 --- a/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile +++ b/packages/libndsfpc/examples/filesystem/libfat/libfatdir/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2267,15 +2273,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/nitrofs/Makefile b/packages/libndsfpc/examples/filesystem/nitrofs/Makefile index 07aa69d5d3..522066152f 100644 --- a/packages/libndsfpc/examples/filesystem/nitrofs/Makefile +++ b/packages/libndsfpc/examples/filesystem/nitrofs/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile index f2343826d2..2911c8e35f 100644 --- a/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile +++ b/packages/libndsfpc/examples/filesystem/nitrofs/nitrodir/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile b/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile index 74fbb244f4..f08ff584bd 100644 --- a/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile +++ b/packages/libndsfpc/examples/gl2d/2Dplus3D/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/gl2d/Makefile b/packages/libndsfpc/examples/gl2d/Makefile index 0e49a882db..440ed2f65b 100644 --- a/packages/libndsfpc/examples/gl2d/Makefile +++ b/packages/libndsfpc/examples/gl2d/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile b/packages/libndsfpc/examples/gl2d/dual_screen/Makefile index b6c6275c0b..7550ace9d1 100644 --- a/packages/libndsfpc/examples/gl2d/dual_screen/Makefile +++ b/packages/libndsfpc/examples/gl2d/dual_screen/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/gl2d/fonts/Makefile b/packages/libndsfpc/examples/gl2d/fonts/Makefile index 52b1a7af3d..3aa3db73c6 100644 --- a/packages/libndsfpc/examples/gl2d/fonts/Makefile +++ b/packages/libndsfpc/examples/gl2d/fonts/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/gl2d/primitives/Makefile b/packages/libndsfpc/examples/gl2d/primitives/Makefile index 6fa7c27359..9f59b62caa 100644 --- a/packages/libndsfpc/examples/gl2d/primitives/Makefile +++ b/packages/libndsfpc/examples/gl2d/primitives/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/gl2d/scrolling/Makefile b/packages/libndsfpc/examples/gl2d/scrolling/Makefile index c42426e12b..5d9edbd66c 100644 --- a/packages/libndsfpc/examples/gl2d/scrolling/Makefile +++ b/packages/libndsfpc/examples/gl2d/scrolling/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/gl2d/sprites/Makefile b/packages/libndsfpc/examples/gl2d/sprites/Makefile index 5e94d6e6e2..bcd3c5e8d7 100644 --- a/packages/libndsfpc/examples/gl2d/sprites/Makefile +++ b/packages/libndsfpc/examples/gl2d/sprites/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile index 61807b06a6..f3f14e13b7 100644 --- a/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/3D_Both_Screens/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile index ecb76bf34b..c2b1331c37 100644 --- a/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/BoxTest/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile index cb91a680f2..e926830ede 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Display_List/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile index 73bafcf8a2..fc156ccf55 100644 --- a/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Display_List_2/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile index 382adfcc12..7699d5f3ad 100644 --- a/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Env_Mapping/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Makefile b/packages/libndsfpc/examples/graphics/3D/Makefile index 02bd77746c..6e4c8ebf08 100644 --- a/packages/libndsfpc/examples/graphics/3D/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile index ce494a58eb..37387a6b5a 100644 --- a/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Mixed_Text_3D/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile index 56e7090809..f3085ed599 100644 --- a/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Ortho/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile index e2761e4ec2..52d816fe16 100644 --- a/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Paletted_Cube/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile index 17b9fff984..91ccfc2bbf 100644 --- a/packages/libndsfpc/examples/graphics/3D/Picking/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Picking/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile index 840000b42c..50c717e5ca 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Quad/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile index 1f68449546..bbedb0415a 100644 --- a/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Simple_Tri/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile index 40025728e2..228b4ea6d0 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Cube/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile index 8b98023ad6..427ed186cc 100644 --- a/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Textured_Quad/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile index 6d871a5995..364125373e 100644 --- a/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/Toon_Shading/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile index b467aaf9a8..0e64b1fbc2 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile index 976211462a..5444eaca56 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson01/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile index ede0d7d405..fb85ab1abf 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson02/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile index 5e8d51a556..cce52ea0de 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson03/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile index 5f4b4c627c..7fb18c5552 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson04/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile index c7111975b4..966fb11e01 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson05/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile index 937c91b655..175c22f637 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson06/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile index ab7d85ebfc..cec041b5e3 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson07/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile index b26603f8d5..53e4e13043 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson08/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile index 7144229ae6..c7b250a153 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson09/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile index 0aebff7750..2cec223d59 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile index e20171e909..13b6ed9cc6 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson10b/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile index dec912deaf..61f4bb84f2 100644 --- a/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile +++ b/packages/libndsfpc/examples/graphics/3D/nehe/lesson11/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile index 0fb7381cd3..3ce009b4e0 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/16bit_color_bmp/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile index 6781308526..949ee5ed11 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/256_color_bmp/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile index bee5824238..b50e1f6d1c 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/Double_Buffer/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/Makefile index 83f976767e..2416ab2770 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile index 3790d12f4f..b0ed7ae469 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/all_in_one/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2270,15 +2276,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile index e9eed8000e..76cad64940 100644 --- a/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile +++ b/packages/libndsfpc/examples/graphics/Backgrounds/rotation/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Effects/Makefile b/packages/libndsfpc/examples/graphics/Effects/Makefile index defc0173b5..8db5df5f9d 100644 --- a/packages/libndsfpc/examples/graphics/Effects/Makefile +++ b/packages/libndsfpc/examples/graphics/Effects/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Effects/windows/Makefile b/packages/libndsfpc/examples/graphics/Effects/windows/Makefile index 66f566ee01..438c3241fe 100644 --- a/packages/libndsfpc/examples/graphics/Effects/windows/Makefile +++ b/packages/libndsfpc/examples/graphics/Effects/windows/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Ext_Palettes/Makefile b/packages/libndsfpc/examples/graphics/Ext_Palettes/Makefile index e4a9aeed0c..fd2f776db3 100644 --- a/packages/libndsfpc/examples/graphics/Ext_Palettes/Makefile +++ b/packages/libndsfpc/examples/graphics/Ext_Palettes/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile b/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile index c617ec4313..93f016fbb3 100644 --- a/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile +++ b/packages/libndsfpc/examples/graphics/Ext_Palettes/backgrounds/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Makefile b/packages/libndsfpc/examples/graphics/Makefile index f36255ec21..92a4cd0fb5 100644 --- a/packages/libndsfpc/examples/graphics/Makefile +++ b/packages/libndsfpc/examples/graphics/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Printing/Makefile b/packages/libndsfpc/examples/graphics/Printing/Makefile index a25f10cae5..6bcaf8716a 100644 --- a/packages/libndsfpc/examples/graphics/Printing/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile b/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile index 50917d649c..2fad929a41 100644 --- a/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/ansi_console/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile b/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile index 8958298826..b1585ef353 100644 --- a/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/console_windows/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile b/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile index 26cda89d78..474288986e 100644 --- a/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/custom_font/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile b/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile index e584f8a541..c9b6dfb210 100644 --- a/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/print_both_screens/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile index 3fe0eb0e81..67e13710c1 100644 --- a/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile +++ b/packages/libndsfpc/examples/graphics/Printing/rotscale_text/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/Makefile index 6648166388..b0b5cca575 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile index b0d57f1922..d6fe326fd9 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/allocation_test/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile index 1732a80094..147b0c49f8 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/animate_simple/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile index aff3bb92d2..5337e3880d 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/bitmap_sprites/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile index b9feaad31c..0ab74cff26 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile b/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile index 09bc597a23..7971e0eb0c 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/simple/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile index dfa7338843..21ec5aa7ab 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_extended_palettes/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile index 752dea7056..da44f695a3 100644 --- a/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile +++ b/packages/libndsfpc/examples/graphics/Sprites/sprite_rotate/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/grit/256colorTilemap/Makefile b/packages/libndsfpc/examples/graphics/grit/256colorTilemap/Makefile index 6807ee05c8..87a8bcc352 100644 --- a/packages/libndsfpc/examples/graphics/grit/256colorTilemap/Makefile +++ b/packages/libndsfpc/examples/graphics/grit/256colorTilemap/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/graphics/grit/Makefile b/packages/libndsfpc/examples/graphics/grit/Makefile index 43ce8dbf7a..057daeb46c 100644 --- a/packages/libndsfpc/examples/graphics/grit/Makefile +++ b/packages/libndsfpc/examples/graphics/grit/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/hello_world/Makefile b/packages/libndsfpc/examples/hello_world/Makefile index 08615649c2..9dccb549a2 100644 --- a/packages/libndsfpc/examples/hello_world/Makefile +++ b/packages/libndsfpc/examples/hello_world/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/Makefile b/packages/libndsfpc/examples/input/Makefile index 93328ef429..f3c07d1d0d 100644 --- a/packages/libndsfpc/examples/input/Makefile +++ b/packages/libndsfpc/examples/input/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/Touch_Pad/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/Makefile index 7431066218..610bea25b0 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile index afe2e51b38..79cbaefd3d 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_area/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile index b6035a0fe5..b043750cd0 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_look/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile index 5bba027fd6..06ab68d136 100644 --- a/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile +++ b/packages/libndsfpc/examples/input/Touch_Pad/touch_test/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/keyboard/Makefile b/packages/libndsfpc/examples/input/keyboard/Makefile index 5eca823f65..dc27453479 100644 --- a/packages/libndsfpc/examples/input/keyboard/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile b/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile index 2973cd92db..6f8b603636 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_async/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile index 11a33d3658..36a655445a 100644 --- a/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile +++ b/packages/libndsfpc/examples/input/keyboard/keyboard_stdin/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/time/Makefile b/packages/libndsfpc/examples/time/Makefile index 8eb6fba9a6..24ac36f4df 100644 --- a/packages/libndsfpc/examples/time/Makefile +++ b/packages/libndsfpc/examples/time/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/time/RealTimeClock/Makefile b/packages/libndsfpc/examples/time/RealTimeClock/Makefile index fdaf7c9274..9e07cd4150 100644 --- a/packages/libndsfpc/examples/time/RealTimeClock/Makefile +++ b/packages/libndsfpc/examples/time/RealTimeClock/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/time/stopwatch/Makefile b/packages/libndsfpc/examples/time/stopwatch/Makefile index cbcb39bf29..d969064a80 100644 --- a/packages/libndsfpc/examples/time/stopwatch/Makefile +++ b/packages/libndsfpc/examples/time/stopwatch/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libndsfpc/examples/time/timercallback/Makefile b/packages/libndsfpc/examples/time/timercallback/Makefile index 5204fa314b..d528e82e5f 100644 --- a/packages/libndsfpc/examples/time/timercallback/Makefile +++ b/packages/libndsfpc/examples/time/timercallback/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2269,15 +2275,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/Makefile b/packages/libogcfpc/Makefile index 0fcf759ee5..8fee45df23 100644 --- a/packages/libogcfpc/Makefile +++ b/packages/libogcfpc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/Makefile b/packages/libogcfpc/examples/Makefile index 7409fcde2b..b612060c87 100644 --- a/packages/libogcfpc/examples/Makefile +++ b/packages/libogcfpc/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/audio/Makefile b/packages/libogcfpc/examples/audio/Makefile index f4d1fa9ad1..7aa2a5e91f 100644 --- a/packages/libogcfpc/examples/audio/Makefile +++ b/packages/libogcfpc/examples/audio/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/audio/modplay/Makefile b/packages/libogcfpc/examples/audio/modplay/Makefile index 32e0d6f277..cf54f47e92 100644 --- a/packages/libogcfpc/examples/audio/modplay/Makefile +++ b/packages/libogcfpc/examples/audio/modplay/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/audio/mp3player/Makefile b/packages/libogcfpc/examples/audio/mp3player/Makefile index f54cf2d54f..5340271d0c 100644 --- a/packages/libogcfpc/examples/audio/mp3player/Makefile +++ b/packages/libogcfpc/examples/audio/mp3player/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/devices/Makefile b/packages/libogcfpc/examples/devices/Makefile index d1e5f4257c..853ecb3ffd 100644 --- a/packages/libogcfpc/examples/devices/Makefile +++ b/packages/libogcfpc/examples/devices/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/devices/network/Makefile b/packages/libogcfpc/examples/devices/network/Makefile index 9a176dc78a..70da1b00de 100644 --- a/packages/libogcfpc/examples/devices/network/Makefile +++ b/packages/libogcfpc/examples/devices/network/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/devices/network/sockettest/Makefile b/packages/libogcfpc/examples/devices/network/sockettest/Makefile index d53522128d..c6a9e5bc43 100644 --- a/packages/libogcfpc/examples/devices/network/sockettest/Makefile +++ b/packages/libogcfpc/examples/devices/network/sockettest/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/devices/usbgecko/Makefile b/packages/libogcfpc/examples/devices/usbgecko/Makefile index 914c392148..08830f1d88 100644 --- a/packages/libogcfpc/examples/devices/usbgecko/Makefile +++ b/packages/libogcfpc/examples/devices/usbgecko/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile b/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile index bb70d1f1a3..1881bf49a1 100644 --- a/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile +++ b/packages/libogcfpc/examples/devices/usbgecko/gdbstub/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/devices/usbkeyboard/Makefile b/packages/libogcfpc/examples/devices/usbkeyboard/Makefile index fa64b40b0e..0a532dfebd 100644 --- a/packages/libogcfpc/examples/devices/usbkeyboard/Makefile +++ b/packages/libogcfpc/examples/devices/usbkeyboard/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile b/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile index 1c52697e95..a5b773ddf2 100644 --- a/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile +++ b/packages/libogcfpc/examples/devices/usbkeyboard/basic_stdin/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/filesystem/Makefile b/packages/libogcfpc/examples/filesystem/Makefile index 8f85d5955c..ad2c244a2b 100644 --- a/packages/libogcfpc/examples/filesystem/Makefile +++ b/packages/libogcfpc/examples/filesystem/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/filesystem/directory/Makefile b/packages/libogcfpc/examples/filesystem/directory/Makefile index d930af618d..7c3b60ba38 100644 --- a/packages/libogcfpc/examples/filesystem/directory/Makefile +++ b/packages/libogcfpc/examples/filesystem/directory/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/Makefile b/packages/libogcfpc/examples/graphics/Makefile index 8aef5cb378..23627ded79 100644 --- a/packages/libogcfpc/examples/graphics/Makefile +++ b/packages/libogcfpc/examples/graphics/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/Makefile b/packages/libogcfpc/examples/graphics/gx/Makefile index 3c3e815776..1e1d340f2e 100644 --- a/packages/libogcfpc/examples/graphics/gx/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile b/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile index 52a9d42bae..83edb8768d 100644 --- a/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/gxSprites/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile index 8344cd742e..72f983e1d5 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile index 45368e7bb0..b0f3c195c3 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson1/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile index 72bf752f21..bf8172f752 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson2/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile index ddd9451236..4d7555b32a 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson3/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile index d814da8580..14126d283c 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson4/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile index da8e351c9e..1323f36d60 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson5/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile index adb7e520f3..79af1e6266 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson6/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile index c5b8e351ce..a02c626b06 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson7/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile index 1d5c1dbc77..57cc03142b 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson8/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile index 348f96e99d..b55f26ebee 100644 --- a/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/neheGX/lesson9/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/graphics/gx/triangle/Makefile b/packages/libogcfpc/examples/graphics/gx/triangle/Makefile index 6981109547..c238040619 100644 --- a/packages/libogcfpc/examples/graphics/gx/triangle/Makefile +++ b/packages/libogcfpc/examples/graphics/gx/triangle/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libogcfpc/examples/template/Makefile b/packages/libogcfpc/examples/template/Makefile index 875b68a869..f4ed5dc813 100644 --- a/packages/libogcfpc/examples/template/Makefile +++ b/packages/libogcfpc/examples/template/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1695,15 +1701,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libpng/Makefile b/packages/libpng/Makefile index f75e37d390..39e852ffe8 100644 --- a/packages/libpng/Makefile +++ b/packages/libpng/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/librsvg/Makefile b/packages/librsvg/Makefile index 3944f548b1..7d1b19c478 100644 --- a/packages/librsvg/Makefile +++ b/packages/librsvg/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libsee/Makefile b/packages/libsee/Makefile index 401d9f9dbc..c9d035b0d3 100644 --- a/packages/libsee/Makefile +++ b/packages/libsee/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libsee/examples/Makefile b/packages/libsee/examples/Makefile index 01326d52fa..f73565cdc5 100644 --- a/packages/libsee/examples/Makefile +++ b/packages/libsee/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libtar/Makefile b/packages/libtar/Makefile index 27780a1786..0e98b7d1e6 100644 --- a/packages/libtar/Makefile +++ b/packages/libtar/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -581,15 +587,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libusb/Makefile b/packages/libusb/Makefile index 25ec83f06d..57edd2b652 100644 --- a/packages/libusb/Makefile +++ b/packages/libusb/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libvlc/Makefile b/packages/libvlc/Makefile index db676e153e..26b99a5174 100644 --- a/packages/libvlc/Makefile +++ b/packages/libvlc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libxml/Makefile b/packages/libxml/Makefile index eea8327a35..2dec984508 100644 --- a/packages/libxml/Makefile +++ b/packages/libxml/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/libxml/examples/Makefile b/packages/libxml/examples/Makefile index 7868cb5944..1a77b74c9a 100644 --- a/packages/libxml/examples/Makefile +++ b/packages/libxml/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/lua/Makefile b/packages/lua/Makefile index 7dfe2eee2a..cdf14160e5 100644 --- a/packages/lua/Makefile +++ b/packages/lua/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/mad/Makefile b/packages/mad/Makefile index 8d783c1c55..9188c801ec 100644 --- a/packages/mad/Makefile +++ b/packages/mad/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/matroska/Makefile b/packages/matroska/Makefile index 96116501a0..52f7cd4471 100644 --- a/packages/matroska/Makefile +++ b/packages/matroska/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/modplug/Makefile b/packages/modplug/Makefile index fcc90d8192..6e6be5fa2f 100644 --- a/packages/modplug/Makefile +++ b/packages/modplug/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/morphunits/Makefile b/packages/morphunits/Makefile index 73c2cb1d79..1602692dd4 100644 --- a/packages/morphunits/Makefile +++ b/packages/morphunits/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index b3a68a6551..85dec6b5de 100644 --- a/packages/mysql/Makefile +++ b/packages/mysql/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/mysql/examples/Makefile b/packages/mysql/examples/Makefile index 6282faa20f..a0dcaf8e5c 100644 --- a/packages/mysql/examples/Makefile +++ b/packages/mysql/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index d2ecb4d6d6..fdcd2faa83 100644 --- a/packages/ncurses/Makefile +++ b/packages/ncurses/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ncurses/examples/Makefile b/packages/ncurses/examples/Makefile index 3ac27a197d..1454fb4af6 100644 --- a/packages/ncurses/examples/Makefile +++ b/packages/ncurses/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/newt/Makefile b/packages/newt/Makefile index f858ee96d8..6e38923052 100644 --- a/packages/newt/Makefile +++ b/packages/newt/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/newt/examples/Makefile b/packages/newt/examples/Makefile index 99dacddd44..649eecabaa 100644 --- a/packages/newt/examples/Makefile +++ b/packages/newt/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile index 28881d29f0..58431acee1 100644 --- a/packages/numlib/Makefile +++ b/packages/numlib/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/numlib/examples/Makefile b/packages/numlib/examples/Makefile index 55b4f45155..35a6acc140 100644 --- a/packages/numlib/examples/Makefile +++ b/packages/numlib/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2258,15 +2264,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/nvapi/Makefile b/packages/nvapi/Makefile index 0ba9bfb074..f6bd9aa45e 100644 --- a/packages/nvapi/Makefile +++ b/packages/nvapi/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/objcrtl/Makefile b/packages/objcrtl/Makefile index 15e3ca6ab5..7717d676c2 100644 --- a/packages/objcrtl/Makefile +++ b/packages/objcrtl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/odata/Makefile b/packages/odata/Makefile index 6b86d56e1e..c92f47e7ad 100644 --- a/packages/odata/Makefile +++ b/packages/odata/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/odbc/Makefile b/packages/odbc/Makefile index 98acc78f0a..e322fc147b 100644 --- a/packages/odbc/Makefile +++ b/packages/odbc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/odbc/examples/Makefile b/packages/odbc/examples/Makefile index 74c34be3bf..a795fe5503 100644 --- a/packages/odbc/examples/Makefile +++ b/packages/odbc/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/oggvorbis/Makefile b/packages/oggvorbis/Makefile index 6169b3ae8c..7fabc222f1 100644 --- a/packages/oggvorbis/Makefile +++ b/packages/oggvorbis/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/openal/Makefile b/packages/openal/Makefile index d99805985c..8db49dff9c 100644 --- a/packages/openal/Makefile +++ b/packages/openal/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/openal/examples/Makefile b/packages/openal/examples/Makefile index 1727b362a2..aaff83c73b 100644 --- a/packages/openal/examples/Makefile +++ b/packages/openal/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/opencl/Makefile b/packages/opencl/Makefile index 40b86a6015..aa22250a94 100644 --- a/packages/opencl/Makefile +++ b/packages/opencl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index ba38bbb9be..709785433e 100644 --- a/packages/opengl/Makefile +++ b/packages/opengl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile index ebe1b1b392..f002ef1a1a 100644 --- a/packages/opengl/examples/Makefile +++ b/packages/opengl/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/opengles/Makefile b/packages/opengles/Makefile index 4d6ecf03d1..4e46b83520 100644 --- a/packages/opengles/Makefile +++ b/packages/opengles/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/opengles/examples/Makefile b/packages/opengles/examples/Makefile index 746dae61fc..90cd95fe2b 100644 --- a/packages/opengles/examples/Makefile +++ b/packages/opengles/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/openssl/Makefile b/packages/openssl/Makefile index bec08a5539..e33ee40464 100644 --- a/packages/openssl/Makefile +++ b/packages/openssl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/oracle/Makefile b/packages/oracle/Makefile index 68ef8a30c9..71477692b6 100644 --- a/packages/oracle/Makefile +++ b/packages/oracle/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/oracle/examples/Makefile b/packages/oracle/examples/Makefile index cf9982ff3b..967ce3de25 100644 --- a/packages/oracle/examples/Makefile +++ b/packages/oracle/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/os2units/Makefile b/packages/os2units/Makefile index 215dde77e6..679cbf59b1 100644 --- a/packages/os2units/Makefile +++ b/packages/os2units/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/os2units/examples/Makefile b/packages/os2units/examples/Makefile index b637b0456e..b5921cfaee 100644 --- a/packages/os2units/examples/Makefile +++ b/packages/os2units/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/os4units/Makefile b/packages/os4units/Makefile index bb36e60d6a..88146ce865 100644 --- a/packages/os4units/Makefile +++ b/packages/os4units/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/palmunits/Makefile b/packages/palmunits/Makefile index 983553a552..1b52e08b4f 100644 --- a/packages/palmunits/Makefile +++ b/packages/palmunits/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/pasjpeg/Makefile b/packages/pasjpeg/Makefile index c567fbcb50..20ab89eebc 100644 --- a/packages/pasjpeg/Makefile +++ b/packages/pasjpeg/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/pastojs/Makefile b/packages/pastojs/Makefile index f8e2fa202c..e5f7ad30ec 100644 --- a/packages/pastojs/Makefile +++ b/packages/pastojs/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index dc07226a68..4e0c75b026 100644 --- a/packages/paszlib/Makefile +++ b/packages/paszlib/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -581,15 +587,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/paszlib/examples/Makefile b/packages/paszlib/examples/Makefile index 1465253658..8866eed8d0 100644 --- a/packages/paszlib/examples/Makefile +++ b/packages/paszlib/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/pcap/Makefile b/packages/pcap/Makefile index aa412948e0..195bc2dc25 100644 --- a/packages/pcap/Makefile +++ b/packages/pcap/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index 3207fa679d..086dc0e64e 100644 --- a/packages/postgres/Makefile +++ b/packages/postgres/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/postgres/examples/Makefile b/packages/postgres/examples/Makefile index 41e935585f..eaabe0fb39 100644 --- a/packages/postgres/examples/Makefile +++ b/packages/postgres/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/proj4/Makefile b/packages/proj4/Makefile index 8940b9c1c8..d231017f3f 100644 --- a/packages/proj4/Makefile +++ b/packages/proj4/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ptc/Makefile b/packages/ptc/Makefile index 2a7b075184..08af4b5d54 100644 --- a/packages/ptc/Makefile +++ b/packages/ptc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/ptc/examples/Makefile b/packages/ptc/examples/Makefile index d0c65065d6..d27f7c1c40 100644 --- a/packages/ptc/examples/Makefile +++ b/packages/ptc/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1118,15 +1124,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/pthreads/Makefile b/packages/pthreads/Makefile index 45e2ac298d..4b4382a493 100644 --- a/packages/pthreads/Makefile +++ b/packages/pthreads/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/pxlib/Makefile b/packages/pxlib/Makefile index 8d3f813ea0..94f37ef8a1 100644 --- a/packages/pxlib/Makefile +++ b/packages/pxlib/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/pxlib/examples/Makefile b/packages/pxlib/examples/Makefile index 1340f0fb64..2dc5108068 100644 --- a/packages/pxlib/examples/Makefile +++ b/packages/pxlib/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -652,15 +658,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile index b11714f692..87387ee468 100644 --- a/packages/regexpr/Makefile +++ b/packages/regexpr/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/regexpr/examples/Makefile b/packages/regexpr/examples/Makefile index 28e3f93ed7..4bf180d5fb 100644 --- a/packages/regexpr/examples/Makefile +++ b/packages/regexpr/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/rexx/Makefile b/packages/rexx/Makefile index 85f195c019..555f3af372 100644 --- a/packages/rexx/Makefile +++ b/packages/rexx/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/rexx/examples/Makefile b/packages/rexx/examples/Makefile index 46a2c33a1b..e0c04d9f33 100644 --- a/packages/rexx/examples/Makefile +++ b/packages/rexx/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/rtl-console/Makefile b/packages/rtl-console/Makefile index a69b176e77..3c40c73b2a 100644 --- a/packages/rtl-console/Makefile +++ b/packages/rtl-console/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/rtl-extra/Makefile b/packages/rtl-extra/Makefile index 826ffd3bd6..4c32a1937e 100644 --- a/packages/rtl-extra/Makefile +++ b/packages/rtl-extra/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/rtl-generics/Makefile b/packages/rtl-generics/Makefile index 01720d24b6..5873e6026d 100644 --- a/packages/rtl-generics/Makefile +++ b/packages/rtl-generics/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/rtl-objpas/Makefile b/packages/rtl-objpas/Makefile index b2254bfb2f..c296f75be0 100644 --- a/packages/rtl-objpas/Makefile +++ b/packages/rtl-objpas/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/rtl-unicode/Makefile b/packages/rtl-unicode/Makefile index 0fc17a6544..ce999a25ec 100644 --- a/packages/rtl-unicode/Makefile +++ b/packages/rtl-unicode/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/sdl/Makefile b/packages/sdl/Makefile index ca90bb9936..bac5ae2028 100644 --- a/packages/sdl/Makefile +++ b/packages/sdl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/sndfile/Makefile b/packages/sndfile/Makefile index 1cce579e99..1d1f8ae409 100644 --- a/packages/sndfile/Makefile +++ b/packages/sndfile/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/sqlite/Makefile b/packages/sqlite/Makefile index 5ab4a9d1dc..def1086860 100644 --- a/packages/sqlite/Makefile +++ b/packages/sqlite/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index 65d21d6eac..c5bb193e76 100644 --- a/packages/svgalib/Makefile +++ b/packages/svgalib/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/svgalib/examples/Makefile b/packages/svgalib/examples/Makefile index 99aa7d93a8..3cb478983d 100644 --- a/packages/svgalib/examples/Makefile +++ b/packages/svgalib/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/symbolic/Makefile b/packages/symbolic/Makefile index d7f73b4609..3b2dbb7f81 100644 --- a/packages/symbolic/Makefile +++ b/packages/symbolic/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/symbolic/examples/Makefile b/packages/symbolic/examples/Makefile index 1a09546e10..34c6398c53 100644 --- a/packages/symbolic/examples/Makefile +++ b/packages/symbolic/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile index 082dfa4c6b..11d56db81e 100644 --- a/packages/syslog/Makefile +++ b/packages/syslog/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/syslog/examples/Makefile b/packages/syslog/examples/Makefile index 6544aecb1a..d9c9005c0f 100644 --- a/packages/syslog/examples/Makefile +++ b/packages/syslog/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/tcl/Makefile b/packages/tcl/Makefile index 537bf4caac..c9b78982ae 100644 --- a/packages/tcl/Makefile +++ b/packages/tcl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/tosunits/Makefile b/packages/tosunits/Makefile index a25516b38d..107791e883 100644 --- a/packages/tosunits/Makefile +++ b/packages/tosunits/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/univint/Makefile b/packages/univint/Makefile index 492ad659a0..ebae260ece 100644 --- a/packages/univint/Makefile +++ b/packages/univint/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/univint/examples/Makefile b/packages/univint/examples/Makefile index da68cd0e33..60917e321f 100644 --- a/packages/univint/examples/Makefile +++ b/packages/univint/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/unixutil/Makefile b/packages/unixutil/Makefile index 4efcbbcd11..8b6af94193 100644 --- a/packages/unixutil/Makefile +++ b/packages/unixutil/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/unzip/Makefile b/packages/unzip/Makefile index d8a66563e8..a8a05a8312 100644 --- a/packages/unzip/Makefile +++ b/packages/unzip/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/users/Makefile b/packages/users/Makefile index 74e62a5fcd..8e0c0f7e87 100644 --- a/packages/users/Makefile +++ b/packages/users/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/users/examples/Makefile b/packages/users/examples/Makefile index 9dbc845c0f..a1841c7e77 100644 --- a/packages/users/examples/Makefile +++ b/packages/users/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index 89316e736c..dbe903ba1f 100644 --- a/packages/utmp/Makefile +++ b/packages/utmp/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/utmp/examples/Makefile b/packages/utmp/examples/Makefile index 6c1f781287..ff22200c2d 100644 --- a/packages/utmp/examples/Makefile +++ b/packages/utmp/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/uuid/Makefile b/packages/uuid/Makefile index d670777884..b58436dbdc 100644 --- a/packages/uuid/Makefile +++ b/packages/uuid/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/uuid/examples/Makefile b/packages/uuid/examples/Makefile index 18d0febba3..54967693ff 100644 --- a/packages/uuid/examples/Makefile +++ b/packages/uuid/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/vcl-compat/Makefile b/packages/vcl-compat/Makefile index 0259a14d9d..f692873a24 100644 --- a/packages/vcl-compat/Makefile +++ b/packages/vcl-compat/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/webidl/Makefile b/packages/webidl/Makefile index cf5debefa4..95706e2e16 100644 --- a/packages/webidl/Makefile +++ b/packages/webidl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/winceunits/Makefile b/packages/winceunits/Makefile index b38a32833f..12aad63798 100644 --- a/packages/winceunits/Makefile +++ b/packages/winceunits/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/winunits-base/Makefile b/packages/winunits-base/Makefile index 12e8bd6e8f..9a79c5aa5d 100644 --- a/packages/winunits-base/Makefile +++ b/packages/winunits-base/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/winunits-jedi/Makefile b/packages/winunits-jedi/Makefile index d4324c6688..6b3729d720 100644 --- a/packages/winunits-jedi/Makefile +++ b/packages/winunits-jedi/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/x11/Makefile b/packages/x11/Makefile index fed814c97c..84c8b3ff84 100644 --- a/packages/x11/Makefile +++ b/packages/x11/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/xforms/Makefile b/packages/xforms/Makefile index 4b790aa5f5..c19d06b11f 100644 --- a/packages/xforms/Makefile +++ b/packages/xforms/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/xforms/examples/Makefile b/packages/xforms/examples/Makefile index f27521efed..8dd70bc3bc 100644 --- a/packages/xforms/examples/Makefile +++ b/packages/xforms/examples/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index 8ce659e420..2f685fa445 100644 --- a/packages/zlib/Makefile +++ b/packages/zlib/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/packages/zorba/Makefile b/packages/zorba/Makefile index 6b810508c7..f99963c30b 100644 --- a/packages/zorba/Makefile +++ b/packages/zorba/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/Makefile b/rtl/Makefile index 09851d34c0..947dfc8e82 100644 --- a/rtl/Makefile +++ b/rtl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile index ce61170548..cfbef5f4d9 100644 --- a/rtl/aix/Makefile +++ b/rtl/aix/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2000,15 +2006,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile index fa40d47a30..0e59c7b594 100644 --- a/rtl/amiga/Makefile +++ b/rtl/amiga/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2284,15 +2290,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/android/Makefile b/rtl/android/Makefile index 5e9e9dea7b..97bfa843ac 100644 --- a/rtl/android/Makefile +++ b/rtl/android/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2853,15 +2859,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/android/jvm/Makefile b/rtl/android/jvm/Makefile index ece0d142d9..66f33598a9 100644 --- a/rtl/android/jvm/Makefile +++ b/rtl/android/jvm/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1416,15 +1422,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile index 8adedb174d..318e58e75a 100644 --- a/rtl/aros/Makefile +++ b/rtl/aros/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2278,15 +2284,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile index 170f644c09..1327fcca2c 100644 --- a/rtl/atari/Makefile +++ b/rtl/atari/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2272,15 +2278,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index d9098433d9..4123d51284 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2557,15 +2563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 5b9f6a42f7..b670952d5a 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2004,15 +2010,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile index 3fa5812ca2..986df9d42e 100644 --- a/rtl/dragonfly/Makefile +++ b/rtl/dragonfly/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2284,15 +2290,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index beecedf74a..a972176796 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -1872,15 +1872,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile index 60c2253464..71b3983f06 100644 --- a/rtl/emx/Makefile +++ b/rtl/emx/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2276,15 +2282,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index d5b8aeecf9..21cfd43a6b 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2289,15 +2295,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile index ba36fd9fe9..cf7d8a1366 100644 --- a/rtl/freertos/Makefile +++ b/rtl/freertos/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2149,15 +2155,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index abf96fe7fa..3e81056303 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1988,15 +1994,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 57e34f2a79..2162dae71d 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2277,15 +2283,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile index de33a77f36..2690d62d3f 100644 --- a/rtl/haiku/Makefile +++ b/rtl/haiku/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2565,15 +2571,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/java/Makefile b/rtl/java/Makefile index 956f6f5f46..061dbf784d 100644 --- a/rtl/java/Makefile +++ b/rtl/java/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1420,15 +1426,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index e558a1071f..ddcd3f3d66 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2887,15 +2893,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index e89381a07b..7e69213786 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1991,15 +1997,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile index 5f24314178..f84845fc5b 100644 --- a/rtl/morphos/Makefile +++ b/rtl/morphos/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1989,15 +1995,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile index aad6408508..7237a5aff8 100644 --- a/rtl/msdos/Makefile +++ b/rtl/msdos/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1989,15 +1995,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile index 10a7727a9c..4217f3b9fd 100644 --- a/rtl/nativent/Makefile +++ b/rtl/nativent/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1997,15 +2003,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile index 40cb0bb0fe..2a67448019 100644 --- a/rtl/nds/Makefile +++ b/rtl/nds/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1988,15 +1994,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index 620c4b8891..aaec5a9b6a 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2286,15 +2292,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile index 79c6d54404..af0a1e671b 100644 --- a/rtl/netware/Makefile +++ b/rtl/netware/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2280,15 +2286,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile index 22128a8c1c..d389c280dc 100644 --- a/rtl/netwlibc/Makefile +++ b/rtl/netwlibc/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2273,15 +2279,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile index db2166531e..8725117837 100644 --- a/rtl/openbsd/Makefile +++ b/rtl/openbsd/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2288,15 +2294,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index 0b56fcbb2c..bf5ffacdbe 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2276,15 +2282,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile index 4734d6d6f8..00fd6f7e26 100644 --- a/rtl/palmos/Makefile +++ b/rtl/palmos/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1987,15 +1993,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/qnx/Makefile b/rtl/qnx/Makefile index a25f26a9d4..b4d3ca4a47 100644 --- a/rtl/qnx/Makefile +++ b/rtl/qnx/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2277,15 +2283,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index 6ca5612358..54ce52a324 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2000,15 +2006,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile index 70441a3bae..3d099830d3 100644 --- a/rtl/symbian/Makefile +++ b/rtl/symbian/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1700,15 +1706,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile index dc973101fe..797abb3a7e 100644 --- a/rtl/watcom/Makefile +++ b/rtl/watcom/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2275,15 +2281,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile index 3f4a68cf2b..33faddd3df 100644 --- a/rtl/wii/Makefile +++ b/rtl/wii/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1703,15 +1709,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile index 0dd5a03cee..9c2c82955e 100644 --- a/rtl/win16/Makefile +++ b/rtl/win16/Makefile @@ -198,6 +198,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1704,15 +1710,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index a2a522b48a..7b53475aa7 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2273,15 +2279,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile index cc9fa8328f..f48a7cd5c7 100644 --- a/rtl/win64/Makefile +++ b/rtl/win64/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -2274,15 +2280,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile index e32e1a7770..1a2c9c029e 100644 --- a/rtl/wince/Makefile +++ b/rtl/wince/Makefile @@ -197,6 +197,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1706,15 +1712,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/tests/Makefile b/tests/Makefile index 19906309bc..7eb8410dda 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -832,15 +838,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile index d4468ae6db..68421448b7 100644 --- a/tests/tstunits/Makefile +++ b/tests/tstunits/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1117,15 +1123,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/tests/utils/Makefile b/tests/utils/Makefile index 2ddcabcc3b..691ae67909 100644 --- a/tests/utils/Makefile +++ b/tests/utils/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1122,15 +1128,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/tests/utils/testsuite/Makefile b/tests/utils/testsuite/Makefile index df76a8a4ed..ffe666f88a 100644 --- a/tests/utils/testsuite/Makefile +++ b/tests/utils/testsuite/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1118,15 +1124,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/Makefile b/utils/Makefile index 83e73a3e1e..966beda215 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -566,15 +572,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/debugsvr/Makefile b/utils/debugsvr/Makefile index 32b8f856c9..3b60e8fcf1 100644 --- a/utils/debugsvr/Makefile +++ b/utils/debugsvr/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/debugsvr/console/Makefile b/utils/debugsvr/console/Makefile index 6e2c2a0270..52fc20901e 100644 --- a/utils/debugsvr/console/Makefile +++ b/utils/debugsvr/console/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1402,15 +1408,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/debugsvr/gtk/Makefile b/utils/debugsvr/gtk/Makefile index 9c02b5d19f..0cd147f42e 100644 --- a/utils/debugsvr/gtk/Makefile +++ b/utils/debugsvr/gtk/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1687,15 +1693,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/dxegen/Makefile b/utils/dxegen/Makefile index 290ddac811..9fbf81e7c5 100644 --- a/utils/dxegen/Makefile +++ b/utils/dxegen/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile index c074e40fcc..eaea4c277d 100644 --- a/utils/fpcm/Makefile +++ b/utils/fpcm/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -558,15 +564,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fpcmkcfg/Makefile b/utils/fpcmkcfg/Makefile index a558ca55f0..2d9084efda 100644 --- a/utils/fpcmkcfg/Makefile +++ b/utils/fpcmkcfg/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fpcres/Makefile b/utils/fpcres/Makefile index 3343bb7af6..bdfdba7461 100644 --- a/utils/fpcres/Makefile +++ b/utils/fpcres/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fpcreslipo/Makefile b/utils/fpcreslipo/Makefile index e6033cbdc6..2b85abf7cb 100644 --- a/utils/fpcreslipo/Makefile +++ b/utils/fpcreslipo/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fpdoc/Makefile b/utils/fpdoc/Makefile index 6132a61fdf..ade51c13f0 100644 --- a/utils/fpdoc/Makefile +++ b/utils/fpdoc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fpdoc/fpde/Makefile b/utils/fpdoc/fpde/Makefile index 1927b2cf26..52dd80ebd0 100644 --- a/utils/fpdoc/fpde/Makefile +++ b/utils/fpdoc/fpde/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -1404,15 +1410,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fpmc/Makefile b/utils/fpmc/Makefile index 505d3594b6..f58b1f2eac 100644 --- a/utils/fpmc/Makefile +++ b/utils/fpmc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fppkg/Makefile b/utils/fppkg/Makefile index 9dfd5e98a2..ec525e6ac4 100644 --- a/utils/fppkg/Makefile +++ b/utils/fppkg/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index 4c8b5fda0b..f42b9e4f99 100644 --- a/utils/fprcp/Makefile +++ b/utils/fprcp/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index a96f5eb51a..5d6b65bb16 100644 --- a/utils/h2pas/Makefile +++ b/utils/h2pas/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/importtl/Makefile b/utils/importtl/Makefile index ff2c7c5819..1e26a2b892 100644 --- a/utils/importtl/Makefile +++ b/utils/importtl/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/instantfpc/Makefile b/utils/instantfpc/Makefile index f45d6452cb..65d44eb3f4 100644 --- a/utils/instantfpc/Makefile +++ b/utils/instantfpc/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/json2pas/Makefile b/utils/json2pas/Makefile index 959677353c..ff13c164ca 100644 --- a/utils/json2pas/Makefile +++ b/utils/json2pas/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/mksymbian/Makefile b/utils/mksymbian/Makefile index f91bb38eeb..9f26873759 100644 --- a/utils/mksymbian/Makefile +++ b/utils/mksymbian/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/pas2fpm/Makefile b/utils/pas2fpm/Makefile index e3345c5912..19795b60ba 100644 --- a/utils/pas2fpm/Makefile +++ b/utils/pas2fpm/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/pas2jni/Makefile b/utils/pas2jni/Makefile index 8359433ecd..ec3e4d8aea 100644 --- a/utils/pas2jni/Makefile +++ b/utils/pas2jni/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/pas2js/Makefile b/utils/pas2js/Makefile index 367b90ebf8..5d307366df 100644 --- a/utils/pas2js/Makefile +++ b/utils/pas2js/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/pas2ut/Makefile b/utils/pas2ut/Makefile index 0e076a5307..170b3891f3 100644 --- a/utils/pas2ut/Makefile +++ b/utils/pas2ut/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/rmwait/Makefile b/utils/rmwait/Makefile index 7c83175707..9ec6c90a67 100644 --- a/utils/rmwait/Makefile +++ b/utils/rmwait/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/tply/Makefile b/utils/tply/Makefile index eba6c0afc6..fa7f71e3e8 100644 --- a/utils/tply/Makefile +++ b/utils/tply/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as diff --git a/utils/unicode/Makefile b/utils/unicode/Makefile index 5d2059a177..1af747d8b0 100644 --- a/utils/unicode/Makefile +++ b/utils/unicode/Makefile @@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -557,15 +563,12 @@ 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 +OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIB +export GCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as |