diff options
| author | Alexander Kyte <alkyte@microsoft.com> | 2019-05-25 11:10:22 +0300 |
|---|---|---|
| committer | Bernhard Urban <lewurm@gmail.com> | 2019-05-25 11:10:21 +0300 |
| commit | 9cb89c9ea98f71b51cd9c26bca00e1e2401bd9b5 (patch) | |
| tree | a38624a4d60d614ce935859141a790ee15fe9c8c /configure.ac | |
| parent | 96b1fd837d6caf1be1b657c0726af3b8caae7060 (diff) | |
[build] Provide in-tree llvm to mono correctly (#14607)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6c2b6671e29..4e939873f69 100644 --- a/configure.ac +++ b/configure.ac @@ -1274,6 +1274,8 @@ INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=10000,nrgctx-fetch-tram AOT_BUILD_ATTRS=$INVARIANT_AOT_OPTIONS +MONO_LLVM_PATH_OPTION=llvm-path="`pwd`/llvm/usr/bin" + if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then DISABLE_MCS_DOCS_default=yes elif test x$with_runtime_preset = xnetcore; then @@ -6625,8 +6627,13 @@ fi if test "x$AOT_BUILD_FLAGS" != "x" ; then echo "AOT_RUN_FLAGS=$AOT_RUN_FLAGS" >> $srcdir/$mcsdir/build/config.make - echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make echo "AOT_BUILD_ATTRS=$AOT_BUILD_ATTRS" >> $srcdir/$mcsdir/build/config.make + + if test "x$internal_llvm" != "xno"; then + echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS,$MONO_LLVM_PATH_OPTION" >> $srcdir/$mcsdir/build/config.make + else + echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make + fi fi if test "x$AOT_MODE" != "x" ; then |