[Lazarus] 131d1062 broke compilation "make all" on x86_64-linux

Martin Frb lazarus at mfriebe.de
Sat Jun 25 00:00:03 CEST 2022


On 24/06/2022 22:16, Marcus Sackrow via lazarus wrote:
>
> Hi,
>
>
> the commit 131d1062 broke the Lazarus compilation on my Jenkins server 
> (for x86_64-linux with latest Free Pascal a simple make all)
>
> https://gitlab.com/freepascal.org/lazarus/lazarus/-/commit/131d1062dff2606d25ace6e031f0b65731cb19f6
>
>
could you test with this patch?

diff --git a/ide/Makefile b/ide/Makefile
index b6a553a776..c35f72c2bf 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -385,6 +385,7 @@ DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
-Fu../components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 
\
-Fu../components/lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 
\
-Fu../components/lazdebuggers/lazdebuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
+ 
-Fu../components/lazdebuggers/lazdebuggerfp/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
-Fu../components/lazdebuggergdbmi/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 
\
-Fu../components/lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) 
\
@@ -407,7 +408,6 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
    -Fu../components/fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
-Fu../components/lazdebuggers/lazdebuggerfplldb/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
- 
-Fu../components/lazdebuggers/lazdebuggerfp/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/leakview/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-Fu../components/memds/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-Fu../components/tachart/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index 18f485dd76..84e12f2b9f 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -97,6 +97,7 @@ DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
-Fu../components/lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 
\
-Fu../components/lazcontrols/design/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 
\
-Fu../components/lazdebuggers/lazdebuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
+ 
-Fu../components/lazdebuggers/lazdebuggerfp/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
-Fu../components/lazdebuggergdbmi/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 
\
-Fu../components/lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) 
\
@@ -122,7 +123,6 @@ BIG_IDE_OPTIONS=-dBigIDE $(DEFAULT_IDE_OPTIONS) \
    -Fu../components/fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
-Fu../components/lazdebuggers/lazdebuggerfplldb/lib/$(CPU_TARGET)-$(OS_TARGET) 
\
- 
-Fu../components/lazdebuggers/lazdebuggerfp/lib/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/leakview/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-Fu../components/memds/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \
-Fu../components/tachart/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) \



More information about the lazarus mailing list