Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
- changeset 542
- 6b93e7a4401d
- parent 532
- 2795874efd16
- child 621
- ffb4d2e95140
equal
deleted
inserted
replaced
| 540:6ee8080a6efe | 542:6b93e7a4401d |
|---|---|
| 952 LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \ | 952 LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \ |
| 953 -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}" | 953 -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}" |
| 954 | 954 |
| 955 # On some platforms (mac) the linker warns about non existing -L dirs. | 955 # On some platforms (mac) the linker warns about non existing -L dirs. |
| 956 # Add server first if available. Linking aginst client does not always produce the same results. | 956 # Add server first if available. Linking aginst client does not always produce the same results. |
| 957 # Only add client dir if client is being built. Default to server for other variants. | 957 # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1. |
| 958 # Default to server for other variants. | |
| 958 if test "x$JVM_VARIANT_SERVER" = xtrue; then | 959 if test "x$JVM_VARIANT_SERVER" = xtrue; then |
| 959 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" | 960 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" |
| 960 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then | 961 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then |
| 961 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client" | 962 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client" |
| 963 elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then | |
| 964 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal" | |
| 962 else | 965 else |
| 963 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" | 966 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" |
| 964 fi | 967 fi |
| 965 | 968 |
| 966 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm" | 969 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm" |
