Pārlūkot izejas kodu

Merged revisions 11880 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r11880 | mazen | 2008-10-11 16:42:37 +0200 (sam, 11 oct 2008) | 2 lines

* If no custom libgdb.a file is found, then we try to look for a system default libgdb.a before deciding to build IDE without debugger support. Some distributions like Debian provide package libgdb-dev with libgdb.a on which official IDE in Debian package should link.
........

git-svn-id: branches/fixes_2_2@12101 -

mazen 17 gadi atpakaļ
vecāks
revīzija
ee2b0346c4
2 mainītis faili ar 19 papildinājumiem un 0 dzēšanām
  1. 8 0
      ide/Makefile
  2. 11 0
      ide/Makefile.fpc

+ 8 - 0
ide/Makefile

@@ -281,6 +281,14 @@ endif
 override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
 endif
 ifeq ($(LIBGDBFILE),)
+SYSLIBDIR=/lib /usr/lib /usr/local/lib
+override LIBGDBFILE=$(firstword $(wildcard $(addsuffix /libgdb.a,$(SYSLIBDIR))))
+ifneq (${LIBGDBFILE},)
+$(warning Using system sefault libgdb file located in ${LIBGDBFILE})
+GDBLIBDIR=$(dir ${LIBGDBFILE})
+endif
+endif
+ifeq ($(LIBGDBFILE),)
 GDB=
 else
 GDB=1

+ 11 - 0
ide/Makefile.fpc

@@ -62,6 +62,17 @@ endif
 override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
 endif
 
+# No custom libgdb.a found, try using system default library if available
+ifeq ($(LIBGDBFILE),)
+SYSLIBDIR=/lib /usr/lib /usr/local/lib
+# Detect if libgdb.a is available
+override LIBGDBFILE=$(firstword $(wildcard $(addsuffix /libgdb.a,$(SYSLIBDIR))))
+ifneq (${LIBGDBFILE},)
+$(warning Using system sefault libgdb file located in ${LIBGDBFILE})
+GDBLIBDIR=$(dir ${LIBGDBFILE})
+endif
+endif
+
 # Disable GDB when no libgdb.a found
 ifeq ($(LIBGDBFILE),)
 GDB=