Repository: incubator-impala
Updated Branches:
  refs/heads/master c03044717 -> 7fc31b534


Fix distcc instructions to help users know they must set BUILD_FARM

While I'm here, remove an errant reference to IMPALA_AUX_TEST_HOME.

Change-Id: I323006110d77de05b251d9fc2578774a78e5509b
Reviewed-on: http://gerrit.cloudera.org:8080/4868
Reviewed-by: Jim Apple <[email protected]>
Tested-by: Tim Armstrong <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/5107669a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/5107669a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/5107669a

Branch: refs/heads/master
Commit: 5107669a7ff6102f14ead96b58af0f958a51e18c
Parents: c030447
Author: Jim Apple <[email protected]>
Authored: Thu Oct 27 12:13:33 2016 -0700
Committer: Tim Armstrong <[email protected]>
Committed: Mon Oct 31 23:18:44 2016 +0000

----------------------------------------------------------------------
 bin/distcc/README.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5107669a/bin/distcc/README.md
----------------------------------------------------------------------
diff --git a/bin/distcc/README.md b/bin/distcc/README.md
index 2de7d4a..d6fe8b7 100644
--- a/bin/distcc/README.md
+++ b/bin/distcc/README.md
@@ -8,16 +8,20 @@ The only requirement you should need to be aware of is, the 
scripts in this fold
 only tested on Linux. If you are using OS X, things probably won't work out of 
the box.
 
 Assuming you are using Linux, if you use the scripts in this folder, there 
shouldn't be
-any other requirements. The distcc program should be installed and configured
-automatically. Still, understanding what is involved could be useful.
+any other requirements other than setting up your build farm and your 
BUILD_FARM variable.
+
+Setting up a new distcc server is covered at the bottom of this document. Once 
your distcc
+servers are configured, set the environment variable BUILD_FARM on your build 
machine to
+to "host1/limit1,lzo host2/limit2,lzo" and so on.
+
+The rest of the setup is done for you; here is a short description of what 
they do:
 
 **You shouldn't need to do any of this, this scripts do this for you.**
 
 1. Install distcc and ccache. Most Linux distros have these packages. The 
scripts will
    install it if you have a yum or apt-get based system. Otherwise you should 
install
    distcc and ccache yourself through whatever package manager your system 
uses.
-1. Configure the remote distcc hosts. Set your environment variable BUILD_FARM 
to
-   "host1/limit1,lzo host2/limit2,lzo" and so on.
+1. Configure the remote distcc hosts.
 1. Your local compiler needs to be at the same path as it is on the remote 
build slaves.
    That path is /opt/Impala-Toolchain/<gcc-version-folder>/bin/gcc. In other 
words, make
    sure the Impala toolchain is available at /opt/Impala-Toolchain. That can 
be done
@@ -33,7 +37,7 @@ automatically. Still, understanding what is involved could be 
useful.
 1. Source "distcc_env.sh" in this directory. The script will attempt to 
install distcc
    if needed.
 
-        source "$IMPALA_AUX_TEST_HOME"/distcc/distcc_env.sh
+        source "$IMPALA_HOME"/bin/distcc/distcc_env.sh
 
 1. Run buildall.sh. The main purpose is to regenerate cmakefiles.
 
@@ -53,7 +57,7 @@ or
 bin/make_impala.sh
 ```
 
-### Switiching back to local compilation
+### Switching back to local compilation
 If you want to compile a very small change, a local build might be faster.
 ```
 switch_compiler local

Reply via email to