Bug 1324120 - Back out changeset a740323ace17 as mozconfig.rust now already uses the TOOLTOOL_DIR. r=gps

--HG--
extra : rebase_source : 2a7e8df7504b783a54ce1eaa34fe1e1913a7ad2b
This commit is contained in:
aleth 2016-12-22 13:21:22 +01:00
parent c3a02d7e8e
commit fa12e7357e
2 changed files with 0 additions and 7 deletions

View File

@ -29,11 +29,6 @@ CFLAGS="$CFLAGS -Wno-attributes"
CPPFLAGS="$CPPFLAGS -Wno-attributes"
CXXFLAGS="$CXXFLAGS -Wno-attributes"
# Override rust toolchain paths. In this build they're in $TOOLTOOL_DIR
# instead of $topsrcdir as referenced by mozconfig.common.
RUSTC=$TOOLTOOL_DIR/rustc/bin/rustc
CARGO=$TOOLTOOL_DIR/rustc/bin/cargo
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk

View File

@ -10,8 +10,6 @@ ANALYSIS_SRCDIR=$JS_SRCDIR/devtools/rootAnalysis
export CC="$TOOLTOOL_DIR/gcc/bin/gcc"
export CXX="$TOOLTOOL_DIR/gcc/bin/g++"
export RUSTC="$TOOLTOOL_DIR/rustc/bin/rustc"
export CARGO="$TOOLTOOL_DIR/rustc/bin/cargo"
PYTHON=python2.7
if ! which $PYTHON; then