diff options
| author | Loïc Hoguin <[email protected]> | 2015-11-17 18:58:20 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-11-17 18:58:20 +0100 |
| commit | 5ebdaa80c8b6f0e2c0431a1000b50fee87a62fb4 (patch) | |
| tree | 5202b0a2743eb3b8b9f6ebd087e8ddfc1ebdc16e /core/core.mk | |
| parent | f66425dc1e2cb2f42874e11fc4ecc651ec4e998d (diff) | |
| parent | ffba4c451fc484cb59e4cfea6d03347895d11ec0 (diff) | |
| download | erlang.mk-5ebdaa80c8b6f0e2c0431a1000b50fee87a62fb4.tar.gz erlang.mk-5ebdaa80c8b6f0e2c0431a1000b50fee87a62fb4.tar.bz2 erlang.mk-5ebdaa80c8b6f0e2c0431a1000b50fee87a62fb4.zip | |
Merge branch 'copy-build.config-after-checking-out-commit' of https://github.com/rabbitmq/erlang.mk
Diffstat (limited to 'core/core.mk')
| -rw-r--r-- | core/core.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/core.mk b/core/core.mk index 17cdf1e..6e15eeb 100644 --- a/core/core.mk +++ b/core/core.mk @@ -192,8 +192,11 @@ ERLANG_MK_BUILD_DIR ?= .erlang.mk.build erlang-mk: git clone $(ERLANG_MK_REPO) $(ERLANG_MK_BUILD_DIR) +ifdef ERLANG_MK_COMMIT + cd $(ERLANG_MK_BUILD_DIR) && git checkout $(ERLANG_MK_COMMIT) +endif if [ -f $(ERLANG_MK_BUILD_CONFIG) ]; then cp $(ERLANG_MK_BUILD_CONFIG) $(ERLANG_MK_BUILD_DIR)/build.config; fi - cd $(ERLANG_MK_BUILD_DIR) && $(if $(ERLANG_MK_COMMIT),git checkout $(ERLANG_MK_COMMIT) &&) $(MAKE) + $(MAKE) -C $(ERLANG_MK_BUILD_DIR) cp $(ERLANG_MK_BUILD_DIR)/erlang.mk ./erlang.mk rm -rf $(ERLANG_MK_BUILD_DIR) |