equal
deleted
inserted
replaced
101 LIB_SETUP_BUNDLED_LIBS |
101 LIB_SETUP_BUNDLED_LIBS |
102 LIB_SETUP_MISC_LIBS |
102 LIB_SETUP_MISC_LIBS |
103 LIB_SETUP_SOLARIS_STLPORT |
103 LIB_SETUP_SOLARIS_STLPORT |
104 |
104 |
105 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
105 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
106 ALWAYS_LIBS="-lc" |
106 GLOBAL_LIBS="-lc" |
107 else |
107 else |
108 ALWAYS_LIBS="" |
108 GLOBAL_LIBS="" |
109 fi |
109 fi |
110 |
110 |
111 BASIC_JDKLIB_LIBS="" |
111 BASIC_JDKLIB_LIBS="" |
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 BASIC_JDKLIB_LIBS="$BASIC_JDKLIB_LIBS $ALWAYS_LIBS" |
115 BASIC_JDKLIB_LIBS="$BASIC_JDKLIB_LIBS" |
116 |
116 |
117 # Math library |
117 # Math library |
118 if test "x$OPENJDK_TARGET_OS" != xsolaris; then |
118 if test "x$OPENJDK_TARGET_OS" != xsolaris; then |
119 BASIC_JVM_LIBS="$LIBM" |
119 BASIC_JVM_LIBS="$LIBM" |
120 else |
120 else |
148 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
148 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
149 BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \ |
149 BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \ |
150 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \ |
150 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \ |
151 wsock32.lib winmm.lib version.lib psapi.lib" |
151 wsock32.lib winmm.lib version.lib psapi.lib" |
152 fi |
152 fi |
153 BASIC_JVM_LIBS="$BASIC_JVM_LIBS $ALWAYS_LIBS" |
|
154 |
153 |
155 JDKLIB_LIBS="$BASIC_JDKLIB_LIBS" |
154 JDKLIB_LIBS="$BASIC_JDKLIB_LIBS" |
156 JDKEXE_LIBS="" |
155 JDKEXE_LIBS="" |
157 JVM_LIBS="$BASIC_JVM_LIBS" |
156 JVM_LIBS="$BASIC_JVM_LIBS" |
158 OPENJDK_BUILD_JDKLIB_LIBS="$BASIC_JDKLIB_LIBS" |
157 OPENJDK_BUILD_JDKLIB_LIBS="$BASIC_JDKLIB_LIBS" |
161 AC_SUBST(JDKLIB_LIBS) |
160 AC_SUBST(JDKLIB_LIBS) |
162 AC_SUBST(JDKEXE_LIBS) |
161 AC_SUBST(JDKEXE_LIBS) |
163 AC_SUBST(JVM_LIBS) |
162 AC_SUBST(JVM_LIBS) |
164 AC_SUBST(OPENJDK_BUILD_JDKLIB_LIBS) |
163 AC_SUBST(OPENJDK_BUILD_JDKLIB_LIBS) |
165 AC_SUBST(OPENJDK_BUILD_JVM_LIBS) |
164 AC_SUBST(OPENJDK_BUILD_JVM_LIBS) |
|
165 AC_SUBST(GLOBAL_LIBS) |
166 ]) |
166 ]) |
167 |
167 |
168 ################################################################################ |
168 ################################################################################ |
169 # Setup various libraries, typically small system libraries |
169 # Setup various libraries, typically small system libraries |
170 ################################################################################ |
170 ################################################################################ |