Fix llvm-utils dir

conda-forge · Sep 21, 2019 · 43b6479 · 43b6479
1 parent 4302653
commit 43b6479
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -18,7 +18,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
       -DLLVM_INCLUDE_GO_TESTS=OFF \
       -DLLVM_INCLUDE_UTILS=ON \
       -DLLVM_INSTALL_UTILS=ON \
-      -DLLVM_UTILS_INSTALL_DIR=$SRC_DIR/install-utils \
+      -DLLVM_UTILS_INSTALL_DIR=$PREFIX/libexec/llvm \
       -DLLVM_INCLUDE_DOCS=OFF \
       -DLLVM_INCLUDE_EXAMPLES=OFF \
       -DLLVM_ENABLE_TERMINFO=OFF \

diff --git a/recipe/install_llvm.sh b/recipe/install_llvm.sh
@@ -7,6 +7,7 @@ if [[ "${PKG_NAME}" == libllvm* ]]; then
     rm -rf $PREFIX/bin
     rm -rf $PREFIX/include
     rm -rf $PREFIX/share
+    rm -rf $PREFIX/libexec
     mv $PREFIX/lib $PREFIX/lib2
     mkdir -p $PREFIX/lib
     mv $PREFIX/lib2/libLLVM-${VER_ARR[0]}${SHLIB_EXT} $PREFIX/lib
@@ -17,7 +18,6 @@ elif [[ "${PKG_NAME}" == "llvm-tools" ]]; then
     rm -rf $PREFIX/lib
     rm -rf $PREFIX/include
     rm $PREFIX/bin/llvm-config
-elif [[ "${PKG_NAME}" == "llvm-utils" ]]; then
-    mv $SRC_DIR/install-utils/* $PREFIX/bin/
+    rm -rf $PREFIX/libexec
 fi
 
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,7 +1,7 @@
 {% set version = "9.0.0" %}
 {% set sha256 = "d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84" %}
 
-{% set build_number = 0 %}
+{% set build_number = 1 %}
 {% set major_ver = version.split(".")[0] %}
 
 package: