diff options
| author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-19 21:10:31 +0000 |
|---|---|---|
| committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-19 21:10:31 +0000 |
| commit | 160802aa67e8d19949a8beaf5c35d611c3aa9dc9 (patch) | |
| tree | 7f55db319017f74c295a45c532234645ec745bae /packages/bzip2 | |
| parent | 2555f001190a52c0d3efd172f0d384f6124969a8 (diff) | |
| parent | cad728e2965c553c486b60ddc6458c9f96d481de (diff) | |
| download | fpc-160802aa67e8d19949a8beaf5c35d611c3aa9dc9.tar.gz | |
* synchronized with trunk
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/z80@44873 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/bzip2')
| -rw-r--r-- | packages/bzip2/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/packages/bzip2/Makefile b/packages/bzip2/Makefile index 0a32201e6e..3165b8b516 100644 --- a/packages/bzip2/Makefile +++ b/packages/bzip2/Makefile @@ -563,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 |