aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-24 14:48:44 +0200
committerFredrik Gustafsson <[email protected]>2013-05-24 14:48:44 +0200
commit3f7107a53d59a2dc35163e8c6119164dfb9e6822 (patch)
treea4c3b15fdb5921893cd0aa7466e627ee962f6343 /erts/emulator
parent01eb20066918e107811d01f43b97e3925f894dbd (diff)
parent590354533f8095e7caf7a317ac82f3e683e843f8 (diff)
downloadotp-3f7107a53d59a2dc35163e8c6119164dfb9e6822.tar.gz
otp-3f7107a53d59a2dc35163e8c6119164dfb9e6822.tar.bz2
otp-3f7107a53d59a2dc35163e8c6119164dfb9e6822.zip
Merge branch 'nox/fix-silent-rules/OTP-11111' into maint
* nox/fix-silent-rules/OTP-11111: Fix some Makefile rules that didn't support silent rules
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 2031ec3a4c..fb4cde0e76 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -1021,7 +1021,8 @@ endif
$(TARGET)/gen_git_version.mk:
# We touch beam/erl_bif.info.c if we regenerated the git version to force a
# rebuild.
- if $(gen_verbose)utils/gen_git_version $@; then touch beam/erl_bif_info.c; fi
+ $(gen_verbose)
+ $(V_at)if utils/gen_git_version $@; then touch beam/erl_bif_info.c; fi
.PHONY: depend
ifdef VOID_EMULATOR