mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-12 05:47:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/ltsmaster'

Browse source
This commit is contained in:
Kai Nacke 2016-04-23 11:19:20 +02:00
commit e55823fd09
11 changed files with 60 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gen/module.cpp
View file

@ -900,7 +900,9 @@ static void genModuleInfo(Module *m, bool emitFullModuleInfo) {
b.finalize(moduleInfoSym->getType()->getPointerElementType(), moduleInfoSym);
setLinkage({LLGlobalValue::ExternalLinkage, false}, moduleInfoSym);
if (global.params.targetTriple->isOSLinux() || global.params.targetTriple->isOSFreeBSD() ||
if ((global.params.targetTriple.isOSLinux() &&
global.params.targetTriple.getEnvironment() != llvm::Triple::Android) ||
global.params.targetTriple.isOSFreeBSD() ||
#if LDC_LLVM_VER > 305
global.params.targetTriple->isOSNetBSD() || global.params.targetTriple->isOSOpenBSD() ||
global.params.targetTriple->isOSDragonFly()