diff options
| author | bors <bors@rust-lang.org> | 2017-02-05 19:33:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-05 19:33:55 +0000 |
| commit | 031c1168b9b3f38405090f6be678a156b7d71e12 (patch) | |
| tree | 38656a85859d0f1a9864ab07b3865b34b3bd4162 /src/rustllvm/RustWrapper.cpp | |
| parent | fc02736d59252fe408dd6c2f7e2c4b6f229e4443 (diff) | |
| parent | a419dd1c013846754c0a3c8dae3842c2739864d4 (diff) | |
| download | rust-031c1168b9b3f38405090f6be678a156b7d71e12.tar.gz rust-031c1168b9b3f38405090f6be678a156b7d71e12.zip | |
Auto merge of #39567 - frewsxcv:rollup, r=frewsxcv
Rollup of 12 pull requests - Successful merges: #39439, #39472, #39481, #39491, #39501, #39509, #39514, #39519, #39526, #39528, #39530, #39538 - Failed merges:
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 34ee7d552f3..c7bcd255818 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -588,7 +588,11 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateStaticVariable( } #endif +#if LLVM_VERSION_GE(4, 0) + return wrap(Builder->createGlobalVariableExpression( +#else return wrap(Builder->createGlobalVariable( +#endif unwrapDI<DIDescriptor>(Context), Name, LinkageName, unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit, #if LLVM_VERSION_GE(4, 0) |