From 2f79e6147ba2fd1d56115f1e36e9f92dd1b44b37 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Tue, 6 Sep 2016 12:21:19 +0000
Subject: [PATCH]    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 -
---
 Makefile     | 12 ++++++++++++
 ide/Makefile |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c4841b5211..8ae151c280 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/ide/Makefile b/ide/Makefile
index c80ad1bede..5aa94eaa95 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -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