|
Lines 1-11
Link Here
|
| 1 |
--- common/autoconf/toolchain.m4.orig 2014-11-08 19:52:00.000000000 -0800 |
1 |
--- common/autoconf/toolchain.m4.orig 2015-09-26 23:49:33.718498000 +0000 |
| 2 |
+++ common/autoconf/toolchain.m4 2014-11-08 19:52:15.000000000 -0800 |
2 |
+++ common/autoconf/toolchain.m4 2015-09-26 23:52:21.858494000 +0000 |
| 3 |
@@ -971,7 +971,7 @@ |
3 |
@@ -342,7 +342,11 @@ |
| 4 |
fi |
4 |
# Elsewhere, gcc is preferred to cc. |
| 5 |
|
5 |
|
| 6 |
if test "`uname -s`" = "FreeBSD"; then |
6 |
if test "x$CC" != x; then |
| 7 |
- PACKAGE_PATH=/usr/local |
7 |
- COMPILER_CHECK_LIST="$CC" |
|
|
8 |
+ if AS_EXECUTABLE_P(["$CC"]); then |
| 9 |
+ COMPILER_CHECK_LIST= |
| 10 |
+ else |
| 11 |
+ COMPILER_CHECK_LIST="$CC" |
| 12 |
+ fi |
| 13 |
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
| 14 |
COMPILER_CHECK_LIST="cl" |
| 15 |
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
| 16 |
@@ -354,7 +358,10 @@ |
| 17 |
COMPILER_CHECK_LIST="gcc cc" |
| 18 |
fi |
| 19 |
|
| 20 |
- TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST]) |
| 21 |
+ if test "x$COMPILER_CHECK_LIST" != x; then |
| 22 |
+ TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST]) |
| 23 |
+ fi |
| 24 |
+ |
| 25 |
# Now that we have resolved CC ourself, let autoconf have its go at it |
| 26 |
AC_PROG_CC([$CC]) |
| 27 |
|
| 28 |
@@ -369,7 +376,11 @@ |
| 29 |
### Locate C++ compiler (CXX) |
| 30 |
|
| 31 |
if test "x$CXX" != x; then |
| 32 |
- COMPILER_CHECK_LIST="$CXX" |
| 33 |
+ if AS_EXECUTABLE_P(["$CXX"]); then |
| 34 |
+ COMPILER_CHECK_LIST= |
| 35 |
+ else |
| 36 |
+ COMPILER_CHECK_LIST="$CXX" |
| 37 |
+ fi |
| 38 |
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
| 39 |
COMPILER_CHECK_LIST="cl" |
| 40 |
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
| 41 |
@@ -381,7 +392,9 @@ |
| 42 |
COMPILER_CHECK_LIST="g++ CC" |
| 43 |
fi |
| 44 |
|
| 45 |
- TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST]) |
| 46 |
+ if test "x$COMPILER_CHECK_LIST" != x; then |
| 47 |
+ TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST]) |
| 48 |
+ fi |
| 49 |
# Now that we have resolved CXX ourself, let autoconf have its go at it |
| 50 |
AC_PROG_CXX([$CXX]) |
| 51 |
|
| 52 |
@@ -1046,7 +1059,7 @@ |
| 53 |
PACKAGE_PATH="$with_package_path" |
| 54 |
if test "x$PACKAGE_PATH" = x; then |
| 55 |
if test "`uname -s`" = "Darwin"; then |
| 56 |
- PACKAGE_PATH=/opt/local |
| 8 |
+ PACKAGE_PATH=%%LOCALBASE%% |
57 |
+ PACKAGE_PATH=%%LOCALBASE%% |
| 9 |
fi |
58 |
fi |
| 10 |
|
59 |
|
| 11 |
if test "`uname -s`" = "NetBSD"; then |
60 |
if test "`uname -s`" = "FreeBSD"; then |