From 9f11549dcbf69a8816c6f8aa7d1b456d49428a53 Mon Sep 17 00:00:00 2001
From: jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Sun, 19 Apr 2020 17:33:47 +0000
Subject:   * regenerated makefiles

git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@44861 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 packages/svgalib/examples/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'packages/svgalib/examples/Makefile')

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
-- 
cgit v1.2.1