diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2004-11-27 05:48:23 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2004-11-27 05:48:23 +0000 |
| commit | 3883849c28bd8ebbe392e0f1e664d8f0ea3e70ca (patch) | |
| tree | e7736df8651e0b921d987f4a5b75053a5dd19056 /java | |
| parent | [MAINTAINER] lang/pike72: Try to fix non i386 compilation breakage. (diff) | |
. Fix the build with gcc 3.4 part 2/2. Don't use the flag
-fmemoize-lookups as gcc 3.4 doesn't understand it. [1]
. Use CXX and CXXFLAGS for compiling C++ code, not CPP and CPPFLAGS.
Also, respect the setting of CXX and CXXFLAGS.
PR: 71516 [1]
Submitted by: Damir Kiramov <damirycha@damirycha.net.ru> [1]
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk13/files/patch-gcc.make | 24 | ||||
| -rw-r--r-- | java/jdk13/files/patch-gcc30.make | 15 | ||||
| -rw-r--r-- | java/jdk13/files/patch-gcc31.make | 24 | ||||
| -rw-r--r-- | java/jdk13/files/patch-gcc32.make | 24 |
4 files changed, 87 insertions, 0 deletions
diff --git a/java/jdk13/files/patch-gcc.make b/java/jdk13/files/patch-gcc.make new file mode 100644 index 000000000000..daba5a107285 --- /dev/null +++ b/java/jdk13/files/patch-gcc.make @@ -0,0 +1,24 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/build/linux/makefiles/gcc.make 23 Apr 2003 18:04:37 -0000 1.6 ++++ ../../hotspot1.3.1/build/linux/makefiles/gcc.make 22 Nov 2004 17:19:42 -0000 +@@ -36,8 +36,6 @@ + + + ##### +-#harmless +-OPT_CFLAGS += -fmemoize-lookups + #unneeded + #OPT_CFLAGS += -fpeephole + #bad +@@ -51,8 +49,8 @@ + # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" + # to inhibit the effect of the previous line on CFLAGS. + +-CPP = g++ +-CC = gcc ++CXX ?= g++ ++CC ?= gcc + + AOUT_FLAGS += -export-dynamic + DEBUG_CFLAGS += -g diff --git a/java/jdk13/files/patch-gcc30.make b/java/jdk13/files/patch-gcc30.make new file mode 100644 index 000000000000..bd0657f4674e --- /dev/null +++ b/java/jdk13/files/patch-gcc30.make @@ -0,0 +1,15 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/build/linux/makefiles/gcc30.make 12 Jul 2002 08:25:58 -0000 1.3 ++++ ../../hotspot1.3.1/build/linux/makefiles/gcc30.make 22 Nov 2004 17:19:42 -0000 +@@ -37,8 +37,8 @@ + # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" + # to inhibit the effect of the previous line on CFLAGS. + +-CPP = g++30 +-CC = gcc30 ++CXX ?= g++30 ++CC ?= gcc30 + + AOUT_FLAGS += -export-dynamic + DEBUG_CFLAGS += -g diff --git a/java/jdk13/files/patch-gcc31.make b/java/jdk13/files/patch-gcc31.make new file mode 100644 index 000000000000..33d4110159f4 --- /dev/null +++ b/java/jdk13/files/patch-gcc31.make @@ -0,0 +1,24 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/build/linux/makefiles/gcc31.make 14 Jul 2002 00:07:59 -0000 1.1 ++++ ../../hotspot1.3.1/build/linux/makefiles/gcc31.make 22 Nov 2004 17:19:42 -0000 +@@ -108,8 +108,6 @@ + + + ##### +-#harmless +-OPT_CFLAGS += -fmemoize-lookups + #unneeded + #OPT_CFLAGS += -fpeephole + #bad +@@ -123,8 +121,8 @@ + # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" + # to inhibit the effect of the previous line on CFLAGS. + +-CPP = g++31 +-CC = gcc31 ++CXX ?= g++31 ++CC ?= gcc31 + + AOUT_FLAGS += -export-dynamic + DEBUG_CFLAGS += -g diff --git a/java/jdk13/files/patch-gcc32.make b/java/jdk13/files/patch-gcc32.make new file mode 100644 index 000000000000..408740c5042f --- /dev/null +++ b/java/jdk13/files/patch-gcc32.make @@ -0,0 +1,24 @@ +$FreeBSD$ + +--- ../../hotspot1.3.1/build/linux/makefiles/gcc32.make 16 Sep 2002 06:21:28 -0000 1.1 ++++ ../../hotspot1.3.1/build/linux/makefiles/gcc32.make 22 Nov 2004 17:19:42 -0000 +@@ -108,8 +108,6 @@ + + + ##### +-#harmless +-OPT_CFLAGS += -fmemoize-lookups + #unneeded + #OPT_CFLAGS += -fpeephole + #bad +@@ -123,8 +121,8 @@ + # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true" + # to inhibit the effect of the previous line on CFLAGS. + +-CPP = g++32 +-CC = gcc32 ++CXX ?= g++32 ++CC ?= gcc32 + + AOUT_FLAGS += -export-dynamic + DEBUG_CFLAGS += -g |