Bug 1075442 - Make the JS engine use gecko/build/stlport on Firefox OS. r=glandium
authorTing-Yuan Huang <thuang@mozilla.com>
Wed, 01 Oct 2014 03:48:00 -0400
changeset 208584 97974cf0eb91d08fd8c20bd7dce2c0a4ed28a16b
parent 208583 32c885eeb5bc08918a2554521d0d350bef8a68fd
child 208585 851353ac5769c1fbde93a65d7abd144bf70e6cb8
push id27586
push useremorley@mozilla.com
push dateFri, 03 Oct 2014 13:38:12 +0000
treeherdermozilla-central@46f41cc9392d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1075442
milestone35.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 1075442 - Make the JS engine use gecko/build/stlport on Firefox OS. r=glandium
js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -197,17 +197,17 @@ if test -n "$gonkdir" ; then
     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
     OBJCOPY="$gonk_toolchain_prefix"objcopy
 
-    STLPORT_CPPFLAGS="-I$gonkdir/external/stlport/stlport"
+    STLPORT_CPPFLAGS="-I$_topsrcdir/build/stlport/stlport -I$gonkdir/ndk/sources/cxx-stl/system/include"
     STLPORT_LIBS="-lstlport"
 
     case "$target_cpu" in
     arm)
         ARCH_DIR=arch-arm
         ;;
     i?86)
         ARCH_DIR=arch-x86