build: Use `pre-inst-env' to compile the source.

* Makefile.am (.scm.go): Use `pre-inst-env' instead of re-defining the
  environment variables, except for `DISTRO_INSTALLED_PATCH_DIRECTORY'
  and `DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY'.
This commit is contained in:
Ludovic Courtès 2012-10-27 15:30:20 +02:00
parent 0778385802
commit fc2f38023b
1 changed files with 6 additions and 12 deletions

View File

@ -130,18 +130,12 @@ CLEANFILES = $(GOBJECTS) *.log
.scm.go: .scm.go:
$(MKDIR_P) `dirname "$@"` $(MKDIR_P) `dirname "$@"`
NIX_INSTANTIATE="$(NIX_INSTANTIATE)" \ DISTRO_INSTALLED_PATCH_DIRECTORY="$(patchdir)" \
NIXPKGS="$(NIXPKGS)" \ DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY="$(bootstrapdir)" \
LIBGCRYPT="$(LIBGCRYPT)" \ $(top_builddir)/pre-inst-env \
DISTRO_PATCH_DIRECTORY="$(top_srcdir)/distro/patches" \ $(GUILD) compile -L "$(top_srcdir)" \
DISTRO_INSTALLED_PATCH_DIRECTORY="$(patchdir)" \ -Wformat -Wunbound-variable -Warity-mismatch \
DISTRO_BOOTSTRAP_DIRECTORY="$(top_srcdir)/distro/packages/bootstrap" \ --target="$(host)" \
DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY="$(bootstrapdir)" \
GUILE_AUTO_COMPILE=0 \
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
$(GUILD) compile -L "$(top_srcdir)" \
-Wformat -Wunbound-variable -Warity-mismatch \
--target="$(host)" \
-o "$@" "$<" -o "$@" "$<"
SUFFIXES = .go SUFFIXES = .go