llvm.org GIT mirror llvm / 6b24116
First step to allowing the resource directory of Clang to be adjusted for strange packaging environments. The primary result of this is to expose a (normally empty) CLANG_RESOURCE_DIR string in the autoconf and CMake builds. This will in turn be used by a subsequent commit to Clang. Regenerated configure and config.h.in thanks to Nick. =D git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116802 91177308-0d34-0410-b5e6-96231b3b80d8 Chandler Carruth 8 years ago
5 changed file(s) with 34 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
7878 set(LLVM_TARGETS_TO_BUILD ${LLVM_ALL_TARGETS}
7979 CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
8080 endif( MSVC )
81
82 set(CLANG_RESOURCE_DIR "" CACHE STRING
83 "Relative directory from the Clang binary to its resource files.")
8184
8285 set(C_INCLUDE_DIRS "" CACHE STRING
8386 "Colon separated list of directories clang will search for headers.")
803803 *) AC_MSG_ERROR([Invalid path for --with-ocaml-libdir. Provide full path]) ;;
804804 esac
805805
806 AC_ARG_WITH(clang-resource-dir,
807 AS_HELP_STRING([--with-clang-resource-dir],
808 [Relative directory from the Clang binary for resource files]),,
809 withval="")
810 AC_DEFINE_UNQUOTED(CLANG_RESOURCE_DIR,"$withval",
811 [Relative directory for resource files])
812
806813 AC_ARG_WITH(c-include-dirs,
807814 AS_HELP_STRING([--with-c-include-dirs],
808815 [Colon separated list of directories clang will search for headers]),,
14411441 --with-extra-options Specify additional options to compile LLVM with
14421442 --with-ocaml-libdir Specify install location for ocaml bindings (default
14431443 is stdlib)
1444 --with-clang-resource-dir
1445 Relative directory from the Clang binary for
1446 resource files
14441447 --with-c-include-dirs Colon separated list of directories clang will
14451448 search for headers
14461449 --with-cxx-include-root Directory with the libstdc++ headers.
52785281 esac
52795282
52805283
5284 # Check whether --with-clang-resource-dir was given.
5285 if test "${with_clang_resource_dir+set}" = set; then
5286 withval=$with_clang_resource_dir;
5287 else
5288 withval=""
5289 fi
5290
5291
5292 cat >>confdefs.h <<_ACEOF
5293 #define CLANG_RESOURCE_DIR "$withval"
5294 _ACEOF
5295
5296
5297
52815298 # Check whether --with-c-include-dirs was given.
52825299 if test "${with_c_include_dirs+set}" = set; then
52835300 withval=$with_c_include_dirs;
1144911466 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1145011467 lt_status=$lt_dlunknown
1145111468 cat > conftest.$ac_ext <
11452 #line 11453 "configure"
11469 #line 11470 "configure"
1145311470 #include "confdefs.h"
1145411471
1145511472 #if HAVE_DLFCN_H
1010
1111 /* Define if CBE is enabled for printf %a output */
1212 #undef ENABLE_CBE_PRINTF_A
13
14 /* Relative directory for resource files */
15 #define CLANG_RESOURCE_DIR "${CLANG_RESOURCE_DIR}"
1316
1417 /* Directories clang will search for headers */
1518 #define C_INCLUDE_DIRS "${C_INCLUDE_DIRS}"
11
22 #ifndef CONFIG_H
33 #define CONFIG_H
4
5 /* Relative directory for resource files */
6 #undef CLANG_RESOURCE_DIR
47
58 /* 32 bit multilib directory. */
69 #undef CXX_INCLUDE_32BIT_DIR