diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d5e7767d7968f9f0772bb1bc1bb5c777e1564317..9e3bcac749925a9bfc086625c2909e02c863e1e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,6 @@ create a temporary commit if you have any unstaged changes. ### Projects If you don't know where to start: -- Check out the list of [starter projects](https://github.com/dropbox/pyston/wiki/Starter-projects) +- Check out our [Github issues list](https://github.com/dropbox/pyston/issues), especially those marked ["probably easy"](https://github.com/dropbox/pyston/labels/probably%20easy) - Email the [pyston-dev mailing list](http://lists.pyston.org/cgi-bin/mailman/listinfo/pyston-dev), or [browse the archives](http://lists.pyston.org/pipermail/pyston-dev/) - Join us on [#pyston](http://webchat.freenode.net/?channels=pyston) on freenode. diff --git a/docs/INSTALLING.md b/docs/INSTALLING.md index 638f28afac13ed0740159302c3ca8726e7072f66..b63676ccb359caf25d3ae046b6af476ae6c5d208 100644 --- a/docs/INSTALLING.md +++ b/docs/INSTALLING.md @@ -98,7 +98,7 @@ apt-get install zsh `readline` is used for the repl. ``` -sudo apt-get install readline +sudo apt-get install libreadline-dev ``` ### gmp diff --git a/llvm_revision.txt b/llvm_revision.txt index 6dbf16e0728882de7cce09c1a90b91bf7b86e0e9..2b926b1076eef54c6347777588e5cb407d5bfe63 100644 --- a/llvm_revision.txt +++ b/llvm_revision.txt @@ -1 +1 @@ -217843 +218648 diff --git a/src/Makefile b/src/Makefile index af96377d97de8fe832d2d757301a20ccaddc9066..fff216eb73d8155952f46fbb3d7a522591d19d70 100644 --- a/src/Makefile +++ b/src/Makefile @@ -454,11 +454,21 @@ llvm_configure: rm -f $(LLVM_BUILD)/Makefile.config $(MAKE) $(LLVM_CONFIGURATION) -LLVM_CONFIGURE_LINE := CXX=$(GPP) $(LLVM_SRC)/configure --enable-targets=host --with-gcc-toolchain=$(GCC_DIR) +# Put the llvm_configure line in its own file, so that we can force an llvm reconfigure +# if we change the configuration parameters. +# (All non-llvm build targets get rebuilt if the main Makefile is touched, but that is too +# expensive to do for the llvm ones.) +LLVM_CONFIG_INCL := Makefile.llvmconfig +# Sets LLVM_CONFIGURE_LINE: +include $(LLVM_CONFIG_INCL) +ifeq (,$(LLVM_CONFIGURE_LINE)) +$(error "did not set configure line") +endif ifneq ($(ENABLE_INTEL_JIT_EVENTS),0) LLVM_CONFIGURE_LINE += --with-intel-jitevents endif -$(LLVM_CONFIGURATION): $(LLVM_SRC)/configure | $(LLVM_SRC)/_patched + +$(LLVM_CONFIGURATION): $(LLVM_SRC)/configure $(LLVM_CONFIG_INCL) | $(LLVM_SRC)/_patched mkdir -p $(LLVM_BUILD) cd $(LLVM_BUILD) ; \ $(LLVM_CONFIGURE_LINE) diff --git a/src/Makefile.llvmconfig b/src/Makefile.llvmconfig new file mode 100644 index 0000000000000000000000000000000000000000..b7a2e63f45c1d29d3a5521aae22b4f9adf4f1b8e --- /dev/null +++ b/src/Makefile.llvmconfig @@ -0,0 +1,3 @@ +# included by Makefile + +LLVM_CONFIGURE_LINE := CXX=$(GPP) LDFLAGS="-Wl,-rpath,$(GCC_DIR)/lib64" $(LLVM_SRC)/configure --enable-targets=host --with-gcc-toolchain=$(GCC_DIR)