Bug 1245088 - Add option to build B2G as 32bit on a 64_32 multilib build target. r=mwu
authorAdam Farden <adam@farden.cz>
Tue, 02 Feb 2016 06:11:00 -0500
changeset 284778 c33f85a4b6a445cb16a287e774dfe9a7ae896c31
parent 284777 1da538db6291099a5da01b02a863805e4cb0ae27
child 284779 90ead10ecd0e2f0acc358aa2df57fbbe67cb8f93
push id19557
push userryanvm@gmail.com
push dateFri, 26 Feb 2016 16:35:10 +0000
treeherderb2g-inbound@90ead10ecd0e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs1245088
milestone47.0a1
Bug 1245088 - Add option to build B2G as 32bit on a 64_32 multilib build target. r=mwu On some build targets Gecko does not build as 64bit correctly. 64bit Android is backwards compatible with 32bit binaries so while we fix Gecko for 64bit we can optionally build Gecko for devices as 32bit. This means we don't have to hold those devices back until Gecko is fixed. Set build flag: BUILD_MULTILIB_GECKO_AS_2ND_ARCH := true
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -305,17 +305,17 @@ if test -n "$gonkdir" ; then
         ;;
     esac
     CPPFLAGS="-DANDROID $TARGET_C_INCLUDES -I$gonkdir/system -I$gonkdir/system/core/include -isystem $gonkdir/bionic -I$gonkdir/hardware/libhardware/include -I$gonkdir/external/valgrind/fxos-include $GONK_INCLUDES $CPPFLAGS"
     CFLAGS="-mandroid -fno-short-enums -fno-exceptions $CFLAGS"
     CXXFLAGS="-mandroid -fno-short-enums -fno-exceptions -Wno-psabi $CXXFLAGS $STLPORT_CPPFLAGS"
     dnl Add -llog by default, since we use it all over the place.
     LIBS="$LIBS -llog"
 
-    LDFLAGS="-mandroid -L$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib -Wl,-rpath-link=$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib --sysroot=$gonkdir/out/target/product/$GONK_PRODUCT/obj/ $LDFLAGS"
+    LDFLAGS="-mandroid -L$GONK_OUT_INTERMEDIATES/lib -Wl,-rpath-link=$GONK_OUT_INTERMEDIATES/lib --sysroot=$GONK_OUT_INTERMEDIATES/ $LDFLAGS"
 
     dnl prevent cross compile section from using these flags as host flags
     if test -z "$HOST_CPPFLAGS" ; then
         HOST_CPPFLAGS=" "
     fi
     if test -z "$HOST_CFLAGS" ; then
         HOST_CFLAGS=" "
     fi
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -203,17 +203,17 @@ if test -n "$gonkdir" ; then
     STLPORT_LIBS="-lstlport"
 
     CPPFLAGS="-DANDROID $TARGET_C_INCLUDES -I$gonkdir/frameworks/base/native/include -I$gonkdir/system/core/include -isystem $gonkdir/bionic $CPPFLAGS -I$gonkdir/external/valgrind/fxos-include"
     CFLAGS="-mandroid -fno-short-enums -fno-exceptions $CFLAGS"
     CXXFLAGS="-mandroid -fno-short-enums -fno-exceptions -Wno-psabi $CXXFLAGS $STLPORT_CPPFLAGS"
     LIBS="$LIBS $STLPORT_LIBS"
 
     dnl Add -llog by default, since we use it all over the place.
-    LDFLAGS="-mandroid -L$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib -Wl,-rpath-link=$gonkdir/out/target/product/$GONK_PRODUCT/obj/lib --sysroot=$gonkdir/out/target/product/$GONK_PRODUCT/obj/ -llog $LDFLAGS"
+    LDFLAGS="-mandroid -L$GONK_OUT_INTERMEDIATES/lib -Wl,-rpath-link=$GONK_OUT_INTERMEDIATES/lib --sysroot=$GONK_OUT_INTERMEDIATES/ -llog $LDFLAGS"
 
     dnl prevent cross compile section from using these flags as host flags
     if test -z "$HOST_CPPFLAGS" ; then
         HOST_CPPFLAGS=" "
     fi
     if test -z "$HOST_CFLAGS" ; then
         HOST_CFLAGS=" "
     fi