1
--- openjdk/hotspot/agent/src/os/linux/Makefile~ 2007-08-02 09:16:50.000000000 +0200
2
+++ openjdk/hotspot/agent/src/os/linux/Makefile 2007-08-08 17:00:11.204338801 +0200
6
ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
8
+GCC = gcc$(GCC_SUFFIX)
10
JAVAH = ${JAVA_HOME}/bin/javah
12
--- openjdk/hotspot/build/linux/makefiles/gcc.make~ 2007-08-08 16:13:12.281815996 +0200
13
+++ openjdk/hotspot/build/linux/makefiles/gcc.make 2007-08-08 16:36:52.573240769 +0200
15
#------------------------------------------------------------------------
20
+CPP = g++$(GCC_SUFFIX)
21
+CC = gcc$(GCC_SUFFIX)
24
# -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
25
--- openjdk/j2se/make/common/shared/Compiler-gcc.gmk~ 2007-08-02 09:17:53.000000000 +0200
26
+++ openjdk/j2se/make/common/shared/Compiler-gcc.gmk 2007-08-08 16:30:52.857814544 +0200
28
ifeq ($(PLATFORM), linux)
30
# Settings specific to Linux
31
- CC = $(COMPILER_PATH)gcc
32
- CPP = $(COMPILER_PATH)gcc -E
33
+ CC = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
34
+ CPP = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -E
35
# statically link libstdc++ before C++ ABI is stablized on Linux
37
ifeq ($(STATIC_CXX),true)
38
# g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
39
# We need to use gcc to statically link the C++ runtime. gcc and g++ use
40
# the same subprocess to compile C++ files, so it is OK to build using gcc.
41
- CXX = $(COMPILER_PATH)gcc
42
+ CXX = $(COMPILER_PATH)gcc$(GCC_SUFFIX)
44
- CXX = $(COMPILER_PATH)g++
45
+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
47
ifneq ("$(findstring sparc,$(ARCH))", "")