From 9772da7eebd018f54364ca2666fae0d5c3a9a333 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Fri, 11 Jan 2008 20:08:47 +0000 Subject: [PATCH] * compare stripped copies of the compiler instead of the original compiler binaries when determining whether cycle has finished on darwin, because when using Dwarf the linked binaries are always slightly different there (because the Dwarf info is kept in the object files and is referenced using a unique identifier, to be able to ascertain that you are using the correct object files and binary together when debugging) git-svn-id: trunk@9715 - --- compiler/Makefile | 6 +++++- compiler/Makefile.fpc | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/compiler/Makefile b/compiler/Makefile index f7bef2480d..74b4bf5fe7 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/08] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded @@ -3171,8 +3171,12 @@ ifeq ($(CPU_SOURCE),$(PPC_TARGET)) ifeq ($(OS_SOURCE),$(OS_TARGET)) ifdef DIFF ifdef OLDFPC +ifneq ($(OS_TARGET),darwin) DIFFRESULT:=$(shell $(DIFF) $(OLDFPC) $(FPC)) else +DIFFRESULT:=$(shell cp $(OLDFPC) $(OLDFPC).tmp; cp $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; rm $(OLDFPC).tmp $(FPC).tmp) +endif +else DIFFRESULT=Not equal endif else diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index 66ba4b790f..5f01f8d1bc 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -401,8 +401,12 @@ ifeq ($(OS_SOURCE),$(OS_TARGET)) # Used to avoid unnecessary steps ifdef DIFF ifdef OLDFPC +ifneq ($(OS_TARGET),darwin) DIFFRESULT:=$(shell $(DIFF) $(OLDFPC) $(FPC)) else +DIFFRESULT:=$(shell cp $(OLDFPC) $(OLDFPC).tmp; cp $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; rm $(OLDFPC).tmp $(FPC).tmp) +endif +else DIFFRESULT=Not equal endif else