Skip to content

Commit

Permalink
ignore uninitialized submodules when checking if ./configure should b…
Browse files Browse the repository at this point in the history
…e re-run
  • Loading branch information
spernsteiner committed Sep 9, 2014
1 parent 504ed55 commit ba43f7b
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion mk/reconfig.mk
Expand Up @@ -15,7 +15,11 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) \

ifndef CFG_DISABLE_MANAGE_SUBMODULES
# This is a pretty expensive operation but I don't see any way to avoid it
NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^\(+\|-\)')
# NB: This only looks for '+' status (wrong commit checked out), not '-' status
# (nothing checked out at all). `./configure --{llvm,jemalloc,libuv}-root`
# will explicitly deinitialize the corresponding submodules, and we don't
# want to force constant rebuilds in that case.
NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^+')
else
NEED_GIT_RECONFIG=0
endif
Expand Down

9 comments on commit ba43f7b

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging epdtry/rust/misc/llvm-root-reconfig = ba43f7b into auto

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

epdtry/rust/misc/llvm-root-reconfig = ba43f7b merged ok, testing candidate = 3224f711

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging epdtry/rust/misc/llvm-root-reconfig = ba43f7b into auto

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

epdtry/rust/misc/llvm-root-reconfig = ba43f7b merged ok, testing candidate = 6faa4f3

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on ba43f7b Sep 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6faa4f3

Please sign in to comment.