maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

autoconf: put generated clang files in build dir 

It was writing generated files to the clang srcdir when
'--with-clang-srcdir' was specified.

llvm-svn: 149756
This commit is contained in:
Dylan Noblesmith 2012-02-04 03:00:50 +00:00
parent 819134a7c4
commit a7a29c17e0
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/autoconf/configure.ac
View File

@ -1574,8 +1574,11 @@ if test "${clang_src_root}" = ""; then
clang_src_root="$srcdir/tools/clang"
fi
if test -f ${clang_src_root}/README.txt; then
AC_CONFIG_HEADERS([${clang_src_root}/include/clang/Config/config.h])
AC_CONFIG_FILES([${clang_src_root}/docs/doxygen.cfg])
dnl Use variables to stay under 80 columns.
configh="include/clang/Config/config.h"
doxy="docs/doxygen.cfg"
AC_CONFIG_HEADERS([tools/clang/${configh}:${clang_src_root}/${configh}.in])
AC_CONFIG_FILES([tools/clang/${doxy}:${clang_src_root}/${doxy}.in])
fi
dnl OCaml findlib META file

10
llvm/configure vendored
View File

@ -21055,9 +21055,11 @@ if test "${clang_src_root}" = ""; then
clang_src_root="$srcdir/tools/clang"
fi
if test -f ${clang_src_root}/README.txt; then
ac_config_headers="$ac_config_headers ${clang_src_root}/include/clang/Config/config.h"
configh="include/clang/Config/config.h"
doxy="docs/doxygen.cfg"
ac_config_headers="$ac_config_headers tools/clang/${configh}:${clang_src_root}/${configh}.in"
ac_config_files="$ac_config_files ${clang_src_root}/docs/doxygen.cfg"
ac_config_files="$ac_config_files tools/clang/${doxy}:${clang_src_root}/${doxy}.in"
fi
@ -21679,8 +21681,8 @@ do
"Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
"llvm.spec") CONFIG_FILES="$CONFIG_FILES llvm.spec" ;;
"docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
"${clang_src_root}/include/clang/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS ${clang_src_root}/include/clang/Config/config.h" ;;
"${clang_src_root}/docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES ${clang_src_root}/docs/doxygen.cfg" ;;
"tools/clang/${configh}") CONFIG_HEADERS="$CONFIG_HEADERS tools/clang/${configh}:${clang_src_root}/${configh}.in" ;;
"tools/clang/${doxy}") CONFIG_FILES="$CONFIG_FILES tools/clang/${doxy}:${clang_src_root}/${doxy}.in" ;;
"bindings/ocaml/llvm/META.llvm") CONFIG_FILES="$CONFIG_FILES bindings/ocaml/llvm/META.llvm" ;;
"setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;