equal
deleted
inserted
replaced
112 if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then |
112 if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then |
113 BASIC_JDKLIB_LIBS="-ljava -ljvm" |
113 BASIC_JDKLIB_LIBS="-ljava -ljvm" |
114 fi |
114 fi |
115 |
115 |
116 # Math library |
116 # Math library |
117 if test "x$OPENJDK_TARGET_OS" != xsolaris; then |
117 BASIC_JVM_LIBS="$LIBM" |
118 BASIC_JVM_LIBS="$LIBM" |
|
119 else |
|
120 # FIXME: This hard-coded path is not really proper. |
|
121 if test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
|
122 BASIC_SOLARIS_LIBM_LIBS="/usr/lib/amd64/libm.so.1" |
|
123 elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then |
|
124 BASIC_SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1" |
|
125 fi |
|
126 BASIC_JVM_LIBS="$BASIC_SOLARIS_LIBM_LIBS" |
|
127 fi |
|
128 |
118 |
129 # Dynamic loading library |
119 # Dynamic loading library |
130 if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then |
120 if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then |
131 BASIC_JVM_LIBS="$BASIC_JVM_LIBS $LIBDL" |
121 BASIC_JVM_LIBS="$BASIC_JVM_LIBS $LIBDL" |
132 fi |
122 fi |