diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-02-13 08:19:58 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-02-13 08:19:58 +0000 |
| commit | 279343f2a3786dd4a86ebb83a94c2bb3ec1deeac (patch) | |
| tree | 8a72c8c981ba98b4aef96d7891c687da09fae38a | |
| parent | 29bbe0caa4efd05d5732c90997edc9c56d4f1db2 (diff) | |
| download | fpc-279343f2a3786dd4a86ebb83a94c2bb3ec1deeac.tar.gz | |
--- Merging r48664 into '.':
U compiler/Makefile
U compiler/Makefile.fpc
--- Recording mergeinfo for merge of r48664 into '.':
U .
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@48665 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | compiler/Makefile | 4 | ||||
| -rw-r--r-- | compiler/Makefile.fpc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index 28210f7e62..9602130f06 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -4109,7 +4109,7 @@ override DIFF:=$(CMP) -i218 endif endif ifeq ($(OS_TARGET), darwin) -CODESIGN?=$(strip $(wildcard $(addsuffix /codesign,$(SEARCHPATH)))) +CODESIGN?=$(firstword $(wildcard $(addsuffix /codesign$(SRCEXEEXT),$(SEARCHPATH)))) endif ifneq ($(CYCLELEVEL),1) ifndef ALLOW_WARNINGS @@ -4310,7 +4310,7 @@ ifneq ($(OS_TARGET),darwin) DIFFRESULT:=$(shell $(DIFF) $(OLDFPC) $(FPC)) else ifneq ($(CODESIGN),) -DIFFRESULT:=$(shell $(COPY) $(OLDFPC) $(OLDFPC).tmp; $(COPY) $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(CODESIGN) --remove-signature $(OLDFPC).tmp; codesign --remove-signature $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; $(RMPROG) $(OLDFPC).tmp $(FPC).tmp) +DIFFRESULT:=$(shell $(COPY) $(OLDFPC) $(OLDFPC).tmp; $(COPY) $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(CODESIGN) --remove-signature $(OLDFPC).tmp; $(CODESIGN) --remove-signature $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; $(RMPROG) $(OLDFPC).tmp $(FPC).tmp) else DIFFRESULT:=$(shell $(COPY) $(OLDFPC) $(OLDFPC).tmp; $(COPY) $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; $(RMPROG) $(OLDFPC).tmp $(FPC).tmp) endif diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index bd3211df85..6155c41f30 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -375,7 +375,7 @@ endif endif ifeq ($(OS_TARGET), darwin) -CODESIGN?=$(strip $(wildcard $(addsuffix /codesign,$(SEARCHPATH)))) +CODESIGN?=$(firstword $(wildcard $(addsuffix /codesign$(SRCEXEEXT),$(SEARCHPATH)))) endif # Use -Sew option by default @@ -683,7 +683,7 @@ ifneq ($(OS_TARGET),darwin) DIFFRESULT:=$(shell $(DIFF) $(OLDFPC) $(FPC)) else ifneq ($(CODESIGN),) -DIFFRESULT:=$(shell $(COPY) $(OLDFPC) $(OLDFPC).tmp; $(COPY) $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(CODESIGN) --remove-signature $(OLDFPC).tmp; codesign --remove-signature $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; $(RMPROG) $(OLDFPC).tmp $(FPC).tmp) +DIFFRESULT:=$(shell $(COPY) $(OLDFPC) $(OLDFPC).tmp; $(COPY) $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(CODESIGN) --remove-signature $(OLDFPC).tmp; $(CODESIGN) --remove-signature $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; $(RMPROG) $(OLDFPC).tmp $(FPC).tmp) else DIFFRESULT:=$(shell $(COPY) $(OLDFPC) $(OLDFPC).tmp; $(COPY) $(FPC) $(FPC).tmp; strip -no_uuid $(OLDFPC).tmp; strip -no_uuid $(FPC).tmp; $(DIFF) $(OLDFPC).tmp $(FPC).tmp; $(RMPROG) $(OLDFPC).tmp $(FPC).tmp) endif |