diff options
| author | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2014-02-18 20:13:04 +0100 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2014-02-24 11:45:52 +0100 |
| commit | 8bc98681fa6bcc7c66c3380f8ceeea12f015f6f6 (patch) | |
| tree | dbf241ffb7e4c4c9a764ac938a1ff796f5641ce5 | |
| parent | b4ce42faabe27edc735d2e3c0cc0dc4981f62299 (diff) | |
| download | erlang-8bc98681fa6bcc7c66c3380f8ceeea12f015f6f6.tar.gz | |
Use correct variable name for silent rule C++ compiler
Using CPP as the variable name for the C++ compiler makes no sense, as CPP
usually refers to the C/C++ preprocessor. That's why we have CXXFLAGS for C++
and CPPFLAGS for the C/C++ preprocessor.
| -rw-r--r-- | lib/wx/c_src/Makefile.in | 10 | ||||
| -rw-r--r-- | make/output.mk.in | 6 |
2 files changed, 8 insertions, 8 deletions
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 "$@; |