equal
deleted
inserted
replaced
364 else |
364 else |
365 OPENJDK_$1_OS_EXPORT_DIR=${OPENJDK_$1_OS_TYPE} |
365 OPENJDK_$1_OS_EXPORT_DIR=${OPENJDK_$1_OS_TYPE} |
366 fi |
366 fi |
367 AC_SUBST(OPENJDK_$1_OS_EXPORT_DIR) |
367 AC_SUBST(OPENJDK_$1_OS_EXPORT_DIR) |
368 |
368 |
|
369 # The new version string in JDK 9 also defined new naming of OS and ARCH for bundles |
|
370 # Macosx is osx and x86_64 is x64 |
|
371 if test "x$OPENJDK_$1_OS" = xmacosx; then |
|
372 OPENJDK_$1_OS_BUNDLE="osx" |
|
373 else |
|
374 OPENJDK_$1_OS_BUNDLE="$OPENJDK_TARGET_OS" |
|
375 fi |
|
376 if test "x$OPENJDK_$1_CPU" = xx86_64; then |
|
377 OPENJDK_$1_CPU_BUNDLE="x64" |
|
378 else |
|
379 OPENJDK_$1_CPU_BUNDLE="$OPENJDK_$1_CPU" |
|
380 fi |
|
381 OPENJDK_$1_BUNDLE_PLATFORM="${OPENJDK_$1_OS_BUNDLE}-${OPENJDK_$1_CPU_BUNDLE}" |
|
382 AC_SUBST(OPENJDK_$1_OS_BUNDLE) |
|
383 AC_SUBST(OPENJDK_$1_CPU_BUNDLE) |
|
384 AC_SUBST(OPENJDK_$1_BUNDLE_PLATFORM) |
|
385 |
369 if test "x$OPENJDK_$1_CPU_BITS" = x64; then |
386 if test "x$OPENJDK_$1_CPU_BITS" = x64; then |
370 A_LP64="LP64:=" |
387 A_LP64="LP64:=" |
371 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in |
388 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in |
372 # unpack200.exe |
389 # unpack200.exe |
373 if test "x$OPENJDK_$1_OS" = xlinux || test "x$OPENJDK_$1_OS" = xmacosx; then |
390 if test "x$OPENJDK_$1_OS" = xlinux || test "x$OPENJDK_$1_OS" = xmacosx; then |