Skip to content

Commit

Permalink
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_…
Browse files Browse the repository at this point in the history
…X/stable
  • Loading branch information
cmsbuild committed Mar 8, 2014
2 parents f44f67a + 6567a3e commit c0133ce
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
12 changes: 12 additions & 0 deletions llvm-gcc-toolfile.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### RPM cms llvm-gcc-toolfile 13.0

Requires: llvm
BuildRequires: python
%if "%(echo %cmsos | grep osx >/dev/null && echo true)" == "true"
Requires: gfortran-macosx
%endif
Expand Down Expand Up @@ -117,6 +118,17 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm.xml
</tool>
EOF_TOOLFILE

cat << \EOF_TOOLFILE >%i/etc/scram.d/pyclang.xml
<tool name="pyclang" version="@LLVM_VERSION@">
<client>
<environment name="PYCLANG_BASE" default="@LLVM_ROOT@"/>
</client>
<runtime name="PYTHONPATH" value="$PYCLANG_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
<use name="python"/>
</tool>
EOF_TOOLFILE
export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)

# NON-empty defaults
# First of all handle OS specific options.
OS_RUNTIME_LDPATH_NAME="LD_LIBRARY_PATH"
Expand Down
5 changes: 5 additions & 0 deletions llvm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ make %makeprocesses
%install
cd objs
make install

BINDINGS_PATH=%i/lib/python$(echo $PYTHON_VERSION | cut -d. -f 1,2)/site-packages
mkdir -p $BINDINGS_PATH
cp -r ../tools/clang/bindings/python/clang $BINDINGS_PATH

rm -f ../tools/clang/tools/scan-build/set-xcode*
find ../tools/clang/tools/scan-build -exec install {} %i/bin \;
find ../tools/clang/tools/scan-view -type f -exec install {} %i/bin \;
Expand Down

0 comments on commit c0133ce

Please sign in to comment.