aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Pierre Letouzey <pierre.letouzey@inria.fr>2016-06-02 15:23:37 +0200
committerGravatar Pierre Letouzey <pierre.letouzey@inria.fr>2016-06-02 15:28:38 +0200
commitb9f491d9d46b65c11d386e3e2f0301401b224816 (patch)
tree82473c330a609531bf8749ee4ca8dfdd04136e52
parentb6b98a67c65d7aeeeeca12d1ccb9d55b654c554d (diff)
Makefile.build: clean a bit the way MacOS binaries are signed
-rw-r--r--Makefile.build11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.build b/Makefile.build
index bf0329ba2..10926daa1 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -95,19 +95,18 @@ BYTEFLAGS=-thread $(CAMLDEBUG) $(USERFLAGS)
OPTFLAGS=-thread $(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS)
DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils
+# On MacOS, the binaries are signed, except our private ones
ifeq ($(shell which codesign > /dev/null 2>&1 && echo $(ARCH)),Darwin)
-LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist"
-CODESIGN:=codesign -s -
+LINKMETADATA=$(if $(filter $(PRIVATEBINARIES),$@),,-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist")
+CODESIGN=$(if $(filter $(PRIVATEBINARIES),$@),true,codesign -s -)
else
LINKMETADATA=
-CODESIGN:=true
+CODESIGN=true
endif
define bestocaml
$(if $(OPT),\
-$(if $(findstring $@,$(PRIVATEBINARIES)),\
- $(OCAMLOPT) $(MLINCLUDES) $(OPTFLAGS) -o $@ $(1) $(addsuffix .cmxa,$(2)) $^ && $(STRIP) $@,\
- $(OCAMLOPT) $(MLINCLUDES) $(OPTFLAGS) $(LINKMETADATA) -o $@ $(1) $(addsuffix .cmxa,$(2)) $^ && $(STRIP) $@ && $(CODESIGN) $@),\
+$(OCAMLOPT) $(MLINCLUDES) $(OPTFLAGS) $(LINKMETADATA) -o $@ $(1) $(addsuffix .cmxa,$(2)) $^ && $(STRIP) $@ && $(CODESIGN) $@,\
$(OCAMLC) $(MLINCLUDES) $(BYTEFLAGS) $(CUSTOM) -o $@ $(1) $(addsuffix .cma,$(2)) $^)
endef