Skip to content

Commit

Permalink
Merge pull request #268 from PRUNERS/issue267-dry-run-recursive-makefile
Browse files Browse the repository at this point in the history
Makefile.in: have recursive make happen with dry run
  • Loading branch information
IanBriggs authored May 22, 2019
2 parents 3956f48 + d3d249f commit dadecf5
Showing 1 changed file with 4 additions and 3 deletions.
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

0 comments on commit dadecf5

Please sign in to comment.