Mercurial > hg > graal-jvmci-8
comparison make/bsd/makefiles/gcc.make @ 4891:719f7007c8e8
7141242: build-infra merge: Rename CPP->CXX and LINK->LD
Summary: Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker.
Reviewed-by: dholmes, ohrstrom
author | erikj |
---|---|
date | Mon, 06 Feb 2012 09:14:22 +0100 |
parents | f4414323345f |
children | 7292cff45988 |
comparison
equal
deleted
inserted
replaced
4890:c77d473e71f7 | 4891:719f7007c8e8 |
---|---|
23 # | 23 # |
24 | 24 |
25 OS_VENDOR = $(shell uname -s) | 25 OS_VENDOR = $(shell uname -s) |
26 | 26 |
27 #------------------------------------------------------------------------ | 27 #------------------------------------------------------------------------ |
28 # CC, CPP & AS | 28 # CC, CXX & AS |
29 | 29 |
30 # When cross-compiling the ALT_COMPILER_PATH points | 30 # When cross-compiling the ALT_COMPILER_PATH points |
31 # to the cross-compilation toolset | 31 # to the cross-compilation toolset |
32 ifdef CROSS_COMPILE_ARCH | 32 ifdef CROSS_COMPILE_ARCH |
33 CPP = $(ALT_COMPILER_PATH)/g++ | 33 CXX = $(ALT_COMPILER_PATH)/g++ |
34 CC = $(ALT_COMPILER_PATH)/gcc | 34 CC = $(ALT_COMPILER_PATH)/gcc |
35 HOSTCPP = g++ | 35 HOSTCXX = g++ |
36 HOSTCC = gcc | 36 HOSTCC = gcc |
37 else ifneq ($(OS_VENDOR), Darwin) | 37 else ifneq ($(OS_VENDOR), Darwin) |
38 CXX = g++ | 38 CXX = g++ |
39 CPP = $(CXX) | |
40 CC = gcc | 39 CC = gcc |
41 HOSTCPP = $(CPP) | 40 HOSTCXX = $(CXX) |
42 HOSTCC = $(CC) | 41 HOSTCC = $(CC) |
43 endif | 42 endif |
44 | 43 |
45 # i486 hotspot requires -mstackrealign on Darwin. | 44 # i486 hotspot requires -mstackrealign on Darwin. |
46 # llvm-gcc supports this in Xcode 3.2.6 and 4.0. | 45 # llvm-gcc supports this in Xcode 3.2.6 and 4.0. |
51 CXX = llvm-g++ | 50 CXX = llvm-g++ |
52 endif | 51 endif |
53 ifeq ($(origin CC), default) | 52 ifeq ($(origin CC), default) |
54 CC = llvm-gcc | 53 CC = llvm-gcc |
55 endif | 54 endif |
56 CPP = $(CXX) | |
57 | 55 |
58 ifeq ($(ARCH), i486) | 56 ifeq ($(ARCH), i486) |
59 LLVM_SUPPORTS_STACKREALIGN := $(shell \ | 57 LLVM_SUPPORTS_STACKREALIGN := $(shell \ |
60 [ "0"`llvm-gcc -v 2>&1 | grep LLVM | sed -E "s/.*LLVM build ([0-9]+).*/\1/"` -gt "2333" ] \ | 58 [ "0"`llvm-gcc -v 2>&1 | grep LLVM | sed -E "s/.*LLVM build ([0-9]+).*/\1/"` -gt "2333" ] \ |
61 && echo true || echo false) | 59 && echo true || echo false) |
65 CC32 ?= llvm-gcc | 63 CC32 ?= llvm-gcc |
66 else | 64 else |
67 CXX32 ?= g++-4.0 | 65 CXX32 ?= g++-4.0 |
68 CC32 ?= gcc-4.0 | 66 CC32 ?= gcc-4.0 |
69 endif | 67 endif |
70 CPP = $(CXX32) | 68 CXX = $(CXX32) |
71 CC = $(CC32) | 69 CC = $(CC32) |
72 endif | 70 endif |
73 | 71 |
74 HOSTCPP = $(CPP) | 72 HOSTCXX = $(CXX) |
75 HOSTCC = $(CC) | 73 HOSTCC = $(CC) |
76 endif | 74 endif |
77 | 75 |
78 AS = $(CC) -c -x assembler-with-cpp | 76 AS = $(CC) -c -x assembler-with-cpp |
79 | 77 |