Skip to content

Commit

Permalink
Merge pull request #17514 from JuliaGPU/vc/llvm_python
Browse files Browse the repository at this point in the history 
Don't assume that /usr/bin/python2 is correct
  • Loading branch information
@tkelman
tkelman committed Jul 21, 2016
2 parents b93e4fb + eca3965 commit dffc068
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions deps/llvm.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,14 @@ $(LLVM_SRC_DIR)/configure: $(LLVM_SRC_DIR)/tools/lldb
endif

# LLDB still relies on plenty of python 2.x infrastructure, without checking
llvm_python_location=$(shell /usr/bin/env python2 -c 'import sys; print(sys.executable)')
llvm_python_workaround=$(SRCDIR)/srccache/python2_path
$(llvm_python_workaround):
mkdir -p $@
-python -c 'import sys; sys.exit(not sys.version_info > (3, 0))' && \
/usr/bin/python2 -c 'import sys; sys.exit(not sys.version_info < (3, 0))' && \
ln -sf /usr/bin/python2 "$@/python" && \
ln -sf /usr/bin/python2-config "$@/python-config"
/usr/bin/env python2 -c 'import sys; sys.exit(not sys.version_info < (3, 0))' && \
ln -sf $(llvm_python_location) "$@/python" && \
ln -sf $(llvm_python_location)-config "$@/python-config"
LLVM_FLAGS += --with-python="$(shell $(SRCDIR)/tools/find_python2)"

ifeq ($(BUILD_CUSTOM_LIBCXX),1)
Expand Down

2 comments on commit dffc068

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily benchmark build, I will reply here when finished:

@nanosoldier runbenchmarks(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your benchmark job has completed - possible performance regressions were detected. A full report can be found here. cc @jrevels

Please sign in to comment.