diff options
| author | Björn Gustavsson <[email protected]> | 2014-02-24 11:49:02 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-02-24 11:49:02 +0100 |
| commit | f56c221205f6e74f027dd74c86ba5ae1e504d318 (patch) | |
| tree | cee1262295a0c51cec472c6babb26de0309ee34d | |
| parent | bfbc7d65c3b2b3741c52047248e193f698287e47 (diff) | |
| parent | 8bc98681fa6bcc7c66c3380f8ceeea12f015f6f6 (diff) | |
| download | otp-f56c221205f6e74f027dd74c86ba5ae1e504d318.tar.gz otp-f56c221205f6e74f027dd74c86ba5ae1e504d318.tar.bz2 otp-f56c221205f6e74f027dd74c86ba5ae1e504d318.zip | |
Merge branch 'ta/silent-rules/OTP-11746'
* ta/silent-rules/OTP-11746:
Use correct variable name for silent rule C++ compiler
Default enable silent rules
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | lib/wx/c_src/Makefile.in | 10 | ||||
| -rw-r--r-- | make/output.mk.in | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 081febd47b..f6cccb4f4b 100644 --- a/configure.in +++ b/configure.in @@ -375,9 +375,9 @@ AS_HELP_STRING( [verbose build output (undo: "make V=0")])dnl ]) -DEFAULT_VERBOSITY=1 -if test X${enable_silent_rules} = Xyes; then - DEFAULT_VERBOSITY=0 +DEFAULT_VERBOSITY=0 +if test X${enable_silent_rules} = Xno; then + DEFAULT_VERBOSITY=1 fi AC_SUBST(DEFAULT_VERBOSITY) diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in index 93a191378f..4a7342f714 100644 --- a/lib/wx/c_src/Makefile.in +++ b/lib/wx/c_src/Makefile.in @@ -80,8 +80,8 @@ TARGET_DIR = ../priv/$(SYS_TYPE) COMMON_CFLAGS = @DEFS@ $(ERL_INCS) CC = @CC@ -CPP = @CXX@ -LD = $(CPP) +CXX = @CXX@ +LD = $(CXX) LDFLAGS = @LDFLAGS@ RESCOMP = @WX_RESCOMP@ @@ -111,7 +111,7 @@ GL_LIBS = @GL_LIBS@ CC_O = $(V_CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) OBJC_CC_O = $(OBJC_CC) -c $(CFLAGS) $(OBJC_CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) -CPP_O = $(V_CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) +CXX_O = $(V_CXX) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) # Targets @@ -141,7 +141,7 @@ $(WX_OBJECTS): $(GENERATED_H) $(GENERAL_H) $(SYS_TYPE)/%.o: %.cpp $(V_at)mkdir -p $(SYS_TYPE) - $(CPP_O) $< -o $@ + $(CXX_O) $< -o $@ $(SYS_TYPE)/%.o: %.c $(V_at)mkdir -p $(SYS_TYPE) @@ -153,7 +153,7 @@ $(SYS_TYPE)/wxe_ps_init.o: wxe_ps_init.c $(SYS_TYPE)/%.o: gen/%.cpp $(V_at)mkdir -p $(SYS_TYPE) - $(CPP_O) $< -o $@ + $(CXX_O) $< -o $@ $(SYS_TYPE)/%.o: gen/%.c $(V_at)mkdir -p $(SYS_TYPE) diff --git a/make/output.mk.in b/make/output.mk.in index 51d9401280..f2f738a2ce 100644 --- a/make/output.mk.in +++ b/make/output.mk.in @@ -65,9 +65,9 @@ cc_verbose_0 = @echo " CC "$@; cc_verbose = $(cc_verbose_$(V)) V_CC = $(cc_verbose)$(CC) -cpp_verbose_0 = @echo " CPP "$@; -cpp_verbose = $(cpp_verbose_$(V)) -V_CPP = $(cpp_verbose)$(CPP) +cxx_verbose_0 = @echo " CXX "$@; +cxx_verbose = $(cxx_verbose_$(V)) +V_CXX = $(cxx_verbose)$(CXX) # For the diameter compiler. dia_verbose_0 = @echo " DIA "$@; |