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 /packages/utmp | |
| 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
Diffstat (limited to 'packages/utmp')
| -rw-r--r-- | packages/utmp/Makefile | 13 | ||||
| -rw-r--r-- | packages/utmp/examples/Makefile | 13 |
2 files changed, 16 insertions, 10 deletions
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 |