From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: [PATCH] Makefile: Speed up .go compilation. Date: Thu, 12 Nov 2015 17:41:15 +0100 Message-ID: <87lha3rx04.fsf@T420.taylan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwuw4-0003fE-KQ for guix-devel@gnu.org; Thu, 12 Nov 2015 11:41:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwuw3-0002a8-Aj for guix-devel@gnu.org; Thu, 12 Nov 2015 11:41:20 -0500 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:37227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwuw2-0002Zo-Rm for guix-devel@gnu.org; Thu, 12 Nov 2015 11:41:19 -0500 Received: by wmww144 with SMTP id w144so96531371wmw.0 for ; Thu, 12 Nov 2015 08:41:17 -0800 (PST) Received: from T420.taylan ([2a02:908:c32:4740:221:ccff:fe66:68f0]) by smtp.gmail.com with ESMTPSA id bh5sm15292883wjb.42.2015.11.12.08.41.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2015 08:41:16 -0800 (PST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain This does the same thing as the 'guix pull' patch, but for our Makefile. Improvement suggestions welcome, since it's pretty hacky. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-build-Speed-up-.go-compilation.patch >From f205496e8f08c3621d2ffe2c802da1f9e367e2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Thu, 5 Nov 2015 23:42:45 +0100 Subject: [PATCH 1/2] build: Speed up .go compilation. * build-aux/compile-all.scm: New file. * Makefile.am: Call build-aux/compile-all.scm to compile many .scm files in a single process. --- Makefile.am | 22 ++++++++-------------- build-aux/compile-all.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 build-aux/compile-all.scm diff --git a/Makefile.am b/Makefile.am index 67d483b..bf73823 100644 --- a/Makefile.am +++ b/Makefile.am @@ -335,14 +335,6 @@ CLEANFILES = \ $(GOBJECTS) \ $(SCM_TESTS:tests/%.scm=%.log) -AM_V_GUILEC = $(AM_V_GUILEC_$(V)) -AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY)) -AM_V_GUILEC_0 = @echo " GUILEC" $@; - -# Flags passed to 'guild compile'. -GUILD_COMPILE_FLAGS = \ - -Wformat -Wunbound-variable -Warity-mismatch - # Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if # $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in # there that are newer than the local .scm files (for instance because the @@ -352,14 +344,16 @@ GUILD_COMPILE_FLAGS = \ # # XXX: Use the C locale for when Guile lacks # . -.scm.go: - $(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ; \ +%.go: make-go ; @: +make-go: $(MODULES) + for f in $^; do \ + $(MKDIR_P) `dirname "$$f"` ; \ + done ; \ unset GUILE_LOAD_COMPILED_PATH ; \ LC_ALL=C \ $(top_builddir)/pre-inst-env \ - $(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)" \ - $(GUILD_COMPILE_FLAGS) --target="$(host)" \ - -o "$@" "$<" + $(GUILE) -L "$(top_builddir)" -L "$(top_srcdir)" \ + --no-auto-compile -s build-aux/compile-all.scm $(host) $^ SUFFIXES = .go @@ -451,6 +445,6 @@ assert-final-inputs-self-contained: $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm" -.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go +.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go .PHONY: assert-no-store-file-names assert-binaries-available .PHONY: assert-final-inputs-self-contained diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm new file mode 100644 index 0000000..b97ce8f --- /dev/null +++ b/build-aux/compile-all.scm @@ -0,0 +1,41 @@ +(use-modules (system base target) + (ice-9 threads)) + +(define compile-options '(format unbound-variable arity-mismatch)) + +(define (file-mtimego file) + (string-append (string-drop-right file 4) ".go")) + +(let* ((args (cdr (command-line))) + (target (car args)) + (files (cdr args))) + (for-each + (lambda (file) + (let ((go (scm->go file))) + (unless (and (file-exists? go) + (file-mtimego file))) + (unless (and (file-exists? go) + (file-mtime