diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch new file mode 100644 index 0000000..f1de194 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0011-autoconf-fix-CC-with-arguments-detection.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 | ||
2 | index e3a82c8..705e3e7 100644 | ||
3 | --- a/common/autoconf/toolchain.m4 | ||
4 | +++ b/common/autoconf/toolchain.m4 | ||
5 | @@ -478,23 +478,30 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], | ||
6 | SEARCH_LIST="$3" | ||
7 | |||
8 | if test "x[$]$1" != x; then | ||
9 | + # split compiler program and arguments | ||
10 | + CBIN=`cut -d ' ' -f1 <<<"[$]$1"` | ||
11 | + CARGS=`cut -d ' ' -f2- <<<"[$]$1"` | ||
12 | + | ||
13 | # User has supplied compiler name already, always let that override. | ||
14 | - AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1]) | ||
15 | - if test "x`basename [$]$1`" = "x[$]$1"; then | ||
16 | + AC_MSG_NOTICE([Will use user supplied compiler ($CBIN) $1=[$]$1]) | ||
17 | + if test "x`basename $CBIN`" = "x$CBIN"; then | ||
18 | # A command without a complete path is provided, search $PATH. | ||
19 | |||
20 | - AC_PATH_PROGS(POTENTIAL_$1, [$]$1) | ||
21 | - if test "x$POTENTIAL_$1" != x; then | ||
22 | - $1=$POTENTIAL_$1 | ||
23 | + AC_PATH_PROGS(POTENTIAL_CBIN, $CBIN) | ||
24 | + if test "x$POTENTIAL_CBIN" != x; then | ||
25 | + CBIN=$POTENTIAL_CBIN | ||
26 | else | ||
27 | - AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found]) | ||
28 | + AC_MSG_ERROR([User supplied compiler $1=$CBIN could not be found]) | ||
29 | fi | ||
30 | else | ||
31 | # Otherwise it might already be a complete path | ||
32 | - if test ! -x "[$]$1"; then | ||
33 | - AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist]) | ||
34 | + if test ! -x "$CBIN"; then | ||
35 | + AC_MSG_ERROR([User supplied compiler $1=$CBIN does not exist]) | ||
36 | fi | ||
37 | fi | ||
38 | + | ||
39 | + $1="$CBIN $CARGS" | ||
40 | + AC_MSG_NOTICE([Mapped user supplied compiler to $1=[$]$1]) | ||
41 | else | ||
42 | # No user supplied value. Locate compiler ourselves. | ||
43 | |||