From ec33e2269d7bf6e5e1be3c78d4cf17a1014753e5 Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Fri, 26 Feb 2016 15:40:44 -0500 Subject: [PATCH] Backout bug 1245088 for build bustage --- configure.in | 2 +- js/src/configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 2432d2e62908..bef32fce9faa 100644 --- a/configure.in +++ b/configure.in @@ -310,7 +310,7 @@ if test -n "$gonkdir" ; then dnl Add -llog by default, since we use it all over the place. LIBS="$LIBS -llog" - LDFLAGS="-mandroid -L$GONK_OUT_INTERMEDIATES/lib -Wl,-rpath-link=$GONK_OUT_INTERMEDIATES/lib --sysroot=$GONK_OUT_INTERMEDIATES/ $LDFLAGS" + 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" dnl prevent cross compile section from using these flags as host flags if test -z "$HOST_CPPFLAGS" ; then diff --git a/js/src/configure.in b/js/src/configure.in index c68d78b88175..d6a80a99a727 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -208,7 +208,7 @@ if test -n "$gonkdir" ; then LIBS="$LIBS $STLPORT_LIBS" dnl Add -llog by default, since we use it all over the place. - LDFLAGS="-mandroid -L$GONK_OUT_INTERMEDIATES/lib -Wl,-rpath-link=$GONK_OUT_INTERMEDIATES/lib --sysroot=$GONK_OUT_INTERMEDIATES/ -llog $LDFLAGS" + 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" dnl prevent cross compile section from using these flags as host flags if test -z "$HOST_CPPFLAGS" ; then