diff options
| author | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-03 17:03:51 +0000 |
|---|---|---|
| committer | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-03 17:03:51 +0000 |
| commit | 2e9edbc98892d32e8b79c31607e284beb6c00636 (patch) | |
| tree | 60c3b065fa902e4b87279fbf3bfddb96226fa41a /libjava/configure.ac | |
| parent | 072866b64ffbe16bc34d0294c4b8bc9b4ec37ac3 (diff) | |
| download | ppe42-gcc-2e9edbc98892d32e8b79c31607e284beb6c00636.tar.gz ppe42-gcc-2e9edbc98892d32e8b79c31607e284beb6c00636.zip | |
Cleanup new JDK directory support in GCJ.
2009-03-03 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Remove dangling src.zip and javac symlinks.
Fix java.security symlink to use toolexeclibdir
as classpath/resource/Makefile.am does.
* Makefile.in,
* configure: Regenerated.
* configure.ac: Drop hard-coded prefix,
thus removing sdk_dir and making jre_dir="jre".
Map x86_64 to amd64 as used by OpenJDK.
* gcj/Makefile.in,
* include/Makefile.in,
* testsuite/Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144576 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index 5d9fd1e849d..2a6b78276fa 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1809,8 +1809,7 @@ then AC_SUBST(BUILD_VERSION) AC_MSG_RESULT(Java version: ${JAVA_VERSION}) - jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre - sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix} + jre_dir=jre jre_lnk=jre-${JAVA_VERSION}-${origin_name} sdk_lnk=java-${JAVA_VERSION}-${origin_name} @@ -1822,31 +1821,28 @@ then AC_SUBST(JVM_JAR_ROOT_DIR) AC_MSG_RESULT(JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR}) - JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir} + JVM_JAR_DIR=${jvm_jar_dir} AC_SUBST(JVM_JAR_DIR) AC_MSG_RESULT(JVM JAR directory: ${JVM_JAR_DIR}) JRE_DIR=${jre_dir} AC_SUBST(JRE_DIR) - SDK_DIR=${sdk_dir} - AC_SUBST(SDK_DIR) - JRE_LNK=${jre_lnk} AC_SUBST(JRE_LNK) SDK_LNK=${sdk_lnk} AC_SUBST(SDK_LNK) - SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin + SDK_BIN_DIR=${jvm_root_dir}/bin AC_SUBST(SDK_BIN_DIR) AC_MSG_RESULT(SDK tools directory: ${SDK_BIN_DIR}) - SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib + SDK_LIB_DIR=${jvm_root_dir}/lib AC_SUBST(SDK_LIB_DIR) AC_MSG_RESULT(SDK jar directory: ${SDK_LIB_DIR}) - SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include + SDK_INCLUDE_DIR=${jvm_root_dir}/include AC_SUBST(SDK_INCLUDE_DIR) AC_MSG_RESULT(SDK include directory: ${SDK_INCLUDE_DIR}) @@ -1868,7 +1864,7 @@ then AC_SUBST(GCJ_BIN_DIR) AC_MSG_RESULT(GCJ tools directory: ${GCJ_BIN_DIR}) - echo host is ${host} + AC_MSG_RESULT(host is ${host}) if test "x${host_cpu}" = "x" then case ${host} in @@ -1876,6 +1872,8 @@ then host_cpu=x86;; i486-* | i586-* | i686-*) host_cpu=i386;; + x86_64-*) + host_cpu=amd64;; *) host_cpu=${host_cpu};; esac |
