about summary refs log tree commit diff
diff options
context:
space:
mode:
authorA.J. Gardner <aaron.j.gardner@gmail.com>2016-11-12 19:13:22 -0600
committerA.J. Gardner <aaron.j.gardner@gmail.com>2016-11-12 19:14:51 -0600
commit7a91d4a25b2b063bf1e1f8cfd1b8d0fd89d84dd0 (patch)
treeb89ae69c21852d73bfa376506738070f7a061941
parentfd983d02e15909567303f92532671fb2b8374285 (diff)
downloadrust-7a91d4a25b2b063bf1e1f8cfd1b8d0fd89d84dd0.tar.gz
rust-7a91d4a25b2b063bf1e1f8cfd1b8d0fd89d84dd0.zip
Add llvm debuginfo configure option
-rwxr-xr-xconfigure4
-rw-r--r--mk/llvm.mk2
2 files changed, 6 insertions, 0 deletions
diff --git a/configure b/configure
index 9c055e7217a..c6f818299ff 100755
--- a/configure
+++ b/configure
@@ -642,6 +642,7 @@ opt_nosave optimize-cxx 1 "build optimized C++ code"
 opt_nosave optimize-llvm 1 "build optimized LLVM"
 opt_nosave llvm-assertions 0 "build LLVM with assertions"
 opt_nosave debug-assertions 0 "build with debugging assertions"
+opt_nosave llvm-debuginfo 0 "build LLVM with debugger metadata"
 opt_nosave debuginfo 0 "build with debugger metadata"
 opt_nosave debuginfo-lines 0 "build with line number debugger metadata"
 opt_nosave debug-jemalloc 0 "build jemalloc with --enable-debug --enable-fill"
@@ -778,6 +779,7 @@ if [ -n "$CFG_DISABLE_OPTIMIZE_CXX" ]; then putvar CFG_DISABLE_OPTIMIZE_CXX; fi
 if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]; then putvar CFG_DISABLE_OPTIMIZE_LLVM; fi
 if [ -n "$CFG_ENABLE_LLVM_ASSERTIONS" ]; then putvar CFG_ENABLE_LLVM_ASSERTIONS; fi
 if [ -n "$CFG_ENABLE_DEBUG_ASSERTIONS" ]; then putvar CFG_ENABLE_DEBUG_ASSERTIONS; fi
+if [ -n "$CFG_ENABLE_LLVM_DEBUGINFO" ]; then putvar CFG_ENABLE_LLVM_DEBUGINFO; fi
 if [ -n "$CFG_ENABLE_DEBUGINFO" ]; then putvar CFG_ENABLE_DEBUGINFO; fi
 if [ -n "$CFG_ENABLE_DEBUGINFO_LINES" ]; then putvar CFG_ENABLE_DEBUGINFO_LINES; fi
 if [ -n "$CFG_ENABLE_DEBUG_JEMALLOC" ]; then putvar CFG_ENABLE_DEBUG_JEMALLOC; fi
@@ -1772,6 +1774,8 @@ do
 
     if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]; then
         CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug"
+    elif [ -n "$CFG_ENABLE_LLVM_DEBUGINFO" ]; then
+        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=RelWithDebInfo"
     else
         CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release"
     fi
diff --git a/mk/llvm.mk b/mk/llvm.mk
index 5a91f5fcaa4..842f1bcee11 100644
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -21,6 +21,8 @@ endif
 
 ifdef CFG_DISABLE_OPTIMIZE_LLVM
 LLVM_BUILD_CONFIG_MODE := Debug
+else ifdef CFG_ENABLE_LLVM_DEBUGINFO
+LLVM_BUILD_CONFIG_MODE := RelWithDebInfo
 else
 LLVM_BUILD_CONFIG_MODE := Release
 endif