paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 11:09:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix setting of -Fl and -Fo arguments, the check for LIBGDB is

Browse Source 
moved to the prerules section so the GDBLIBDIR can be used
    in the compiler.librarydir setting
This commit is contained in:
peter 2002-09-07 12:39:19 +00:00
parent e94bef4279
commit 5466969467
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/base/gdbint/Makefile
View File

@ -201,6 +201,28 @@ endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=gdbint override PACKAGE_NAME=gdbint
override PACKAGE_VERSION=1.0.6 override PACKAGE_VERSION=1.0.6
ifdef inUnix
CURRDIR=./
else
CURRDIR=
endif
ifdef GDBLIBDIR
override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
endif
ifeq ($(LIBGDB),)
override GDBLIBDIR=libgdb/$(OS_TARGET)
ifeq ($(OS_TARGET),go32v2)
ifneq ($(DJDIR),)
GDBLIBDIR+=$(DJDIR)/lib
endif
endif
override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
endif
ifeq ($(LIBGDB),)
GDBFOUND=0
else
GDBFOUND=1
endif
override TARGET_UNITS+=gdbint gdbcon override TARGET_UNITS+=gdbint gdbcon
override TARGET_EXAMPLES+=testgdb symify override TARGET_EXAMPLES+=testgdb symify
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
@ -1327,28 +1349,6 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),) ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
ifdef inUnix
CURRDIR=./
else
CURRDIR=
endif
ifdef GDBLIBDIR
override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
endif
ifeq ($(LIBGDB),)
override GDBLIBDIR=libgdb/$(OS_TARGET)
ifeq ($(OS_TARGET),go32v2)
ifneq ($(DJDIR),)
GDBLIBDIR+=$(DJDIR)/lib
endif
endif
override LIBGDB:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
endif
ifeq ($(LIBGDB),)
GDBFOUND=0
else
GDBFOUND=1
endif
ifeq ($(GDBFOUND),1) ifeq ($(GDBFOUND),1)
$(CURRDIR)getver$(EXEEXT) : gdbver.pp $(CURRDIR)getver$(EXEEXT) : gdbver.pp
$(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp $(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp

4
packages/base/gdbint/Makefile.fpc
View File

@ -24,7 +24,7 @@ fpcpackage=y
fpcdir=../../.. fpcdir=../../..
[rules] [prerules]
# For unix be sure to use the locally created gdbver # For unix be sure to use the locally created gdbver
ifdef inUnix ifdef inUnix
CURRDIR=./ CURRDIR=./
@ -56,6 +56,8 @@ else
GDBFOUND=1 GDBFOUND=1
endif endif
[rules]
ifeq ($(GDBFOUND),1) ifeq ($(GDBFOUND),1)
# libgdb.a found # libgdb.a found