diff options
| author | dim <dim@FreeBSD.org> | 2011-06-12 15:42:51 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-06-12 15:42:51 +0000 |
| commit | ece02cd5829cea836e9365b0845a8ef042d17b0a (patch) | |
| tree | b3032e51d630e8070e9e08d6641648f195316a80 /autoconf | |
| parent | 2b066988909948dc3d53d01760bc2d71d32f3feb (diff) | |
| download | FreeBSD-src-ece02cd5829cea836e9365b0845a8ef042d17b0a.zip FreeBSD-src-ece02cd5829cea836e9365b0845a8ef042d17b0a.tar.gz | |
Vendor import of llvm trunk r132879:
http://llvm.org/svn/llvm-project/llvm/trunk@132879
Diffstat (limited to 'autoconf')
| -rwxr-xr-x | autoconf/config.guess | 5 | ||||
| -rw-r--r-- | autoconf/configure.ac | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/autoconf/config.guess b/autoconf/config.guess index 865fe53..9807c91 100755 --- a/autoconf/config.guess +++ b/autoconf/config.guess @@ -789,13 +789,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index b55f564..f0e7c42 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1528,7 +1528,7 @@ dnl Set the flags needed to emit LLVM IR and to disable optimizations dnl in llvmgcc if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir" - LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns" + LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-llvm-ir-optimize=0" else LLVMCC_EMITIR_FLAG="-emit-llvm" LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns" @@ -1723,6 +1723,12 @@ AC_CONFIG_FILES([Makefile.config]) dnl Configure the RPM spec file for LLVM AC_CONFIG_FILES([llvm.spec]) +dnl Configure doxygen's configuration file +AC_CONFIG_FILES([docs/doxygen.cfg]) +if test -f ${srcdir}/tools/clang/README.txt; then + AC_CONFIG_FILES([tools/clang/docs/doxygen.cfg]) +fi + dnl Configure llvmc's Base plugin AC_CONFIG_FILES([tools/llvmc/src/Base.td]) |
