782 |
782 |
783 # Customize LDFLAGS for libs |
783 # Customize LDFLAGS for libs |
784 LDFLAGS_JDKLIB="${LDFLAGS_JDK}" |
784 LDFLAGS_JDKLIB="${LDFLAGS_JDK}" |
785 |
785 |
786 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
786 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
787 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -dll -libpath:${JDK_OUTPUTDIR}/lib" |
787 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -dll -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base" |
788 LDFLAGS_JDKLIB_SUFFIX="" |
788 LDFLAGS_JDKLIB_SUFFIX="" |
789 else |
789 else |
790 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS} \ |
790 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS} \ |
791 -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}" |
791 -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}" |
792 |
792 |
793 # On some platforms (mac) the linker warns about non existing -L dirs. |
793 # On some platforms (mac) the linker warns about non existing -L dirs. |
794 # Add server first if available. Linking aginst client does not always produce the same results. |
794 # Add server first if available. Linking aginst client does not always produce the same results. |
795 # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1. |
795 # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1. |
796 # Default to server for other variants. |
796 # Default to server for other variants. |
797 if test "x$JVM_VARIANT_SERVER" = xtrue; then |
797 if test "x$JVM_VARIANT_SERVER" = xtrue; then |
798 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" |
798 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/server" |
799 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then |
799 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then |
800 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client" |
800 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/client" |
801 elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then |
801 elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then |
802 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal" |
802 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/minimal" |
803 else |
803 else |
804 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" |
804 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${OUTPUT_ROOT}/support/modules_libs/java.base${OPENJDK_TARGET_CPU_LIBDIR}/server" |
805 fi |
805 fi |
806 |
806 |
807 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm" |
807 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm" |
808 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
808 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
809 LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc" |
809 LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc" |