You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

46 lines
1.5 KiB

# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../erlang-otp/wx-CXX.patch
# Copyright (C) 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description:
CPP is not a good variable name to choose for defining the C++ compiler,
because it is often used for the C Preprocessor (CPP).
This patch is renaming the CPP variable to CXX, which should be more
standard behavior.
diff -ruN otp_src_R13B04-orig/lib/wx/c_src/Makefile.in otp_src_R13B04/lib/wx/c_src/Makefile.in
--- otp_src_R13B04-orig/lib/wx/c_src/Makefile.in 2010-02-19 19:05:57.000000000 +0100
+++ otp_src_R13B04/lib/wx/c_src/Makefile.in 2010-08-23 13:54:00.028057277 +0200
@@ -82,8 +82,8 @@
COMMON_CFLAGS = @DEFS@ $(ERL_INCS)
CC = @CC@
-CPP = @CXX@
-LD = $(CPP)
+CXX = @CXX@
+LD = $(CXX)
LDFLAGS = @LDFLAGS@
RESCOMP = @WX_RESCOMP@
@@ -107,7 +107,7 @@
endif
CC_O = $(CC) -c $(CFLAGS) $(COMMON_CFLAGS)
-CPP_O = $(CPP) -c $(CPP_FLAGS) $(COMMON_CFLAGS)
+CPP_O = $(CXX) -c $(CPP_FLAGS) $(COMMON_CFLAGS)
# Targets