equal
deleted
inserted
replaced
386 elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then |
386 elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then |
387 # On all platforms except macosx, we replace x86_64 with amd64. |
387 # On all platforms except macosx, we replace x86_64 with amd64. |
388 OPENJDK_$1_CPU_JLI="amd64" |
388 OPENJDK_$1_CPU_JLI="amd64" |
389 fi |
389 fi |
390 |
390 |
391 if test "x$OPENJDK_$1_OS" = xmacosx; then |
|
392 OPENJDK_$1_OS_EXPORT_DIR=macosx |
|
393 else |
|
394 OPENJDK_$1_OS_EXPORT_DIR=${OPENJDK_$1_OS_TYPE} |
|
395 fi |
|
396 AC_SUBST(OPENJDK_$1_OS_EXPORT_DIR) |
|
397 |
|
398 # The new version string in JDK 9 also defined new naming of OS and ARCH for bundles |
391 # The new version string in JDK 9 also defined new naming of OS and ARCH for bundles |
399 # Macosx is osx and x86_64 is x64 |
392 # Macosx is osx and x86_64 is x64 |
400 if test "x$OPENJDK_$1_OS" = xmacosx; then |
393 if test "x$OPENJDK_$1_OS" = xmacosx; then |
401 OPENJDK_$1_OS_BUNDLE="osx" |
394 OPENJDK_$1_OS_BUNDLE="osx" |
402 else |
395 else |