partially fix llvm-config

This commit is contained in:
Alexey Pavlov
2018-07-15 00:00:53 +03:00
parent 909d7f098d
commit d3b5ec0ad1
2 changed files with 18 additions and 9 deletions

View File

@@ -24,6 +24,14 @@ index 08b096afb05..e388d9e5d3f 100644
} else {
StaticExt = "lib";
DirSep = "\\";
@@ -393,7 +393,7 @@
bool DyLibExists = false;
const std::string DyLibName =
- (SharedPrefix + "LLVM-" + SharedVersionedExt).str();
+ (SharedPrefix + (HostTriple.isOSWindows() ? "LLVM" : "LLVM-") + SharedVersionedExt).str();
// If LLVM_LINK_DYLIB is ON, the single shared library will be returned
// for "--libs", etc, if they exist. This behaviour can be overridden with
--
2.13.3

View File

@@ -7,7 +7,7 @@
# We can switch to clang when it fully works with mingw-w64
#_compiler=clang
_compiler=gcc
_generator="MSYS Makefiles"
_realname=clang
pkgbase=mingw-w64-${_realname}
@@ -23,24 +23,25 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-llvm"
"${MINGW_PACKAGE_PREFIX}-polly")
pkgver=6.0.1
pkgrel=1
pkgrel=2
pkgdesc="C language family frontend for LLVM (mingw-w64)"
arch=('any')
url="https://llvm.org/"
license=("custom:University of Illinois/NCSA Open Source License")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake>=3.4.3"
"${MINGW_PACKAGE_PREFIX}-z3"
$([[ "$_compiler" == "clang" ]] && echo \
"${MINGW_PACKAGE_PREFIX}-clang")
$([[ "$_generator" == "Ninja"]] && echo \
"${MINGW_PACKAGE_PREFIX}-ninja")
"${MINGW_PACKAGE_PREFIX}-libffi"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-python3-sphinx"
"${MINGW_PACKAGE_PREFIX}-python2"
"${MINGW_PACKAGE_PREFIX}-swig"
"tar"
"groff")
"groff"
$([[ "$_compiler" == "clang" ]] && echo \
"${MINGW_PACKAGE_PREFIX}-clang")
$([[ "$_generator" == "Ninja" ]] && echo \
"${MINGW_PACKAGE_PREFIX}-ninja")
)
depends=("${MINGW_PACKAGE_PREFIX}-gcc")
options=('!debug' 'strip')
source=(https://releases.llvm.org/${pkgver}/llvm-${pkgver}.src.tar.xz{,.sig}
@@ -119,7 +120,7 @@ sha256sums=('b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2'
'd5b11097084f8a03dd3002c2adb27b4fec99cf290404049f1a4e1185274bde67'
'5081a1a9d8074b275f3087d4d80a13ce5d1c20bc1962819953790e54275930c8'
'46e10ce71525836d67466af954542c7133b646d7cc81dc30388f42dc27c7a6d6'
'ca317e0d14dd52f115345c5e27f825d109654a43d5fc812ecdc883e0437677a1'
'1f318c0370357fdf9c54ae6d31bad761b0caa58ac099998937b636309ecb6590'
'7f0c64cd87b61e894be632f180ae5291e1aa9f1d9d382608f659067eeeda7146'
'f6e04b5e2a65e1eaa4ab6d14427cf17b1e79625a428430dd16a441578b31df55'
'7140be792ec6806f3ed962839c85baecafe4d87df30c17d02cca476a37f6da8c'