Bug 794412: Support building from either old or new toolchain while we transition. r=doublec
authorChris Jones <jones.chris.g@gmail.com>
Wed, 26 Sep 2012 11:12:46 -0700
changeset 108162 3dfca392c32b0357f6a65329decd3abc5528395c
parent 108161 8f0b50af10510a9a3fb0450d528e8f9fc4031150
child 108163 15cc8994c2be885c4adf3307bbdaef6e3f3b4b8f
push id23539
push userryanvm@gmail.com
push dateWed, 26 Sep 2012 22:55:55 +0000
treeherdermozilla-central@ec079fd92224 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdoublec
bugs794412
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 794412: Support building from either old or new toolchain while we transition. r=doublec
configure.in
--- a/configure.in
+++ b/configure.in
@@ -180,17 +180,17 @@ if test -n "$gonkdir" ; then
     CC="$gonk_toolchain_prefix"gcc
     CXX="$gonk_toolchain_prefix"g++
     CPP="$gonk_toolchain_prefix"cpp
     LD="$gonk_toolchain_prefix"ld
     AR="$gonk_toolchain_prefix"ar
     RANLIB="$gonk_toolchain_prefix"ranlib
     STRIP="$gonk_toolchain_prefix"strip
 
-    STLPORT_CPPFLAGS="-I$gonkdir/ndk/sources/cxx-stl/stlport/stlport/"
+    STLPORT_CPPFLAGS="-I$gonkdir/ndk/sources/cxx-stl/stlport/stlport/ -I$gonkdir/external/stlport/stlport/"
     STLPORT_LIBS="-lstlport"
 
     case "$target_cpu" in
     arm)
         ARCH_DIR=arch-arm
         ;;
     i?86)
         ARCH_DIR=arch-x86