Makefile's regenerated after:

Set GDBMI Makefile environment variable for targets that support
   building IDE with GDBMI.

   GDBMI is set to 1 if target OS is in the list GDBMI_DEFAULT_OS_LIST

 * Add comment about GDBMI_DEFAULT_OS_LIST, stating that this 
   makefile variable appaers at three levels:
   fpcbuild, fpcsrc and fpcsrc/ide
   but that the content should be kept equal.

fpsrc/ide/Makefile.fpc:
 * Do not use GDBMI if NOGDB is used.

git-svn-id: trunk@34438 -
This commit is contained in:
pierre 2016-09-06 12:21:19 +00:00
parent c3957a0f79
commit 2f79e6147b
2 changed files with 14 additions and 1 deletions

View File

@ -465,6 +465,17 @@ endif
CLEANOPTS=FPC=$(PPNEW)
BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1 'OPT=$(OPTNEW)'
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
GDBMI_DEFAULT_OS_LIST=aix darwin freebsd haiku linux netbsd openbsd solaris win32 win64
ifndef NOGDBMI
ifneq ($(findstring $(OS_TARGET),$(GDBMI_DEFAULT_OS_LIST)),)
export GDBMI=1
endif
endif
ifdef GDBMI
ifneq ($(GDBMI),0)
IDE=1
endif
else # not GDBMI
ifndef CROSSCOMPILE
ifneq ($(wildcard ide),)
IDETARGETS=go32v2 win32 win64 linux freebsd os2 emx beos haiku
@ -473,6 +484,7 @@ IDE=1
endif
endif
endif
endif # not GDBMI
BuildOnlyBaseCPUs=jvm
ifneq ($(wildcard utils),)
NOUTILSTARGETS=embedded gba nds msdos win16 $(BuildOnlyBaseCPUs)

View File

@ -2292,7 +2292,7 @@ FPMAKE_OPT+=-sp
endif
ifdef NOGDB
FPMAKE_OPT+=--NoGDB=1
endif
else
ifndef NOGDBMI
ifneq ($(findstring $(OS_TARGET),$(GDBMI_DEFAULT_OS_LIST)),)
FPMAKE_OPT+=--GDBMI=1
@ -2302,6 +2302,7 @@ ifdef GDBMI
FPMAKE_OPT+=--GDBMI=1
endif
endif
endif
ifdef PPC_TARGET
FPMAKE_OPT+=--CompilerTarget=$(PPC_TARGET)
endif