mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-09 05:05:18 +00:00
merge recent changes
This commit is contained in:
parent
a7a1c30a58
commit
65fb2295cb
2
debian/libclang1-X.Y.install.in
vendored
2
debian/libclang1-X.Y.install.in
vendored
@ -1,2 +1,2 @@
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
|
||||
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
|
||||
|
5
debian/rules
vendored
5
debian/rules
vendored
@ -252,11 +252,12 @@ build_doc:
|
||||
echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
|
||||
done; \
|
||||
fi
|
||||
|
||||
# the clang doc generation only generates clang manpage
|
||||
# When it will do more, we should move that in the loop above
|
||||
cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
|
||||
|
||||
# Remove the copy of jquery. See bug #701087
|
||||
for d in $(TARGET_BUILD)/docs/html/_static/ $(TARGET_BUILD)/tools/clang/docs/html/_static/ $(TARGET_BUILD)/tools/clang/tools/extra/docs/html/_static/ $(TARGET_BUILD)/tools/polly/docs/html/_static/; do \
|
||||
for d in $(TARGET_BUILD)/docs/html/_static/ $(TARGET_BUILD)/tools/clang/docs/html/_static/ $(TARGET_BUILD)/tools/clang/tools/extra/docs/html/_static/; do \
|
||||
cd $$d && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js && cd -; \
|
||||
cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \
|
||||
done
|
||||
|
Loading…
Reference in New Issue
Block a user