diff options
| author | Lukas Larsson <[email protected]> | 2013-02-13 16:25:43 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-02-13 16:25:43 +0100 |
| commit | 7505ceff94dddb325543e32f3b8471a608097dc9 (patch) | |
| tree | 9453b92c4c8965881f78906e5d59837a009c15f1 /erts/emulator/Makefile.in | |
| parent | 14254702c27e9010f65cab69cd2829b00012d7ff (diff) | |
| parent | 3e95d5f8e4a348efbb8fb1036da3fa9368c75ae2 (diff) | |
| download | otp-7505ceff94dddb325543e32f3b8471a608097dc9.tar.gz otp-7505ceff94dddb325543e32f3b8471a608097dc9.tar.bz2 otp-7505ceff94dddb325543e32f3b8471a608097dc9.zip | |
Merge branch 'lukas/erts/add_sha_to_shell_title/OTP-10838'
* lukas/erts/add_sha_to_shell_title/OTP-10838:
Include git sha in prompt if available
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 3e44bbb8db..7033ea0a3d 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -20,6 +20,8 @@ include $(ERL_TOP)/make/target.mk include ../vsn.mk include $(ERL_TOP)/make/$(TARGET)/otp.mk +include $(TARGET)/gen_git_version.mk + ENABLE_ALLOC_TYPE_VARS = @ENABLE_ALLOC_TYPE_VARS@ HIPE_ENABLED=@HIPE_ENABLED@ @@ -196,7 +198,7 @@ else EMU_CC = @EMU_CC@ endif WFLAGS = @WFLAGS@ -CFLAGS = @STATIC_CFLAGS@ $(TYPE_FLAGS) $(FLAVOR_FLAGS) $(DEFS) $(WFLAGS) $(THR_DEFS) $(ARCHCFLAGS) +CFLAGS = @STATIC_CFLAGS@ $(TYPE_FLAGS) $(FLAVOR_FLAGS) $(DEFS) $(WFLAGS) $(THR_DEFS) $(ARCHCFLAGS) $(GIT_VSN) HCC = @HCC@ LD = @LD@ DEXPORT = @DEXPORT@ @@ -1006,6 +1008,12 @@ DEP_FLAGS=-MM $(MG_FLAG) $(CFLAGS) $(INCLUDES) -Idrivers/common -Idrivers/$(ERLA SYS_SRC=$(ALL_SYS_SRC) endif +.PHONY: $(TARGET)/gen_git_version.mk +$(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 + .PHONY: depend ifdef VOID_EMULATOR depend: |