Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile.in: have recursive make happen with dry run #268

Merged
merged 1 commit into from
May 22, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions data/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,9 @@ R_CUR_COMPILER ?=
R_CUR_OPTL ?=
R_CUR_SWITCHES ?=

$(OBJ_DIR):
mkdir -p $(OBJ_DIR)

# If we are in a recursion
ifdef R_IS_RECURSED

Expand Down Expand Up @@ -369,8 +372,6 @@ ifeq ($(call IS_VER_4_OR_5,$(GT_CXX)),0)
endif
endif

$(OBJ_DIR):
mkdir -p $(OBJ_DIR)
$(RESULTS_DIR):
mkdir -p $(RESULTS_DIR)

Expand All @@ -396,7 +397,7 @@ TARGETS += $$(RESULTS_DIR)/$(strip $1)_$$(HOSTNAME)_$(strip $3)_$(strip $2)
# rebuilt, so does each recursive target.

$$(RESULTS_DIR)/$(strip $1)_$$(HOSTNAME)_$(strip $3)_$(strip $2): $$(GT_TARGET) | $$(OBJ_DIR) $$(RESULTS_DIR)
-$$(MAKE) rec \
-+$$(MAKE) rec \
R_IS_RECURSED=True \
R_CUR_COMPILER=$(strip $1) \
R_CUR_OPTL=$(strip $2) \
Expand Down