equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
79 |
79 |
80 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) |
80 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) |
81 if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then |
81 if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then |
82 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1" |
82 LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1" |
83 fi |
83 fi |
|
84 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
|
85 LIBCXX_JVM="-lCrun" |
|
86 fi |
84 |
87 |
85 AC_SUBST(LIBCXX) |
88 AC_SUBST(LIBCXX) |
86 |
89 |
87 # Setup Windows runtime dlls |
90 # Setup Windows runtime dlls |
88 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
91 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |