Merge branch atnnn/3757 into v1.16.x

mk/support/pkg/v8.sh

@@ -1,11 +1,6 @@
 
 version=3.22.24.17
 
-# Other versions of v8 to test against:
-# version=3.7.12.22 # Ubuntu Lucid
-# version=3.17.4.1  # A pre-3.19 version
-# version=3.19.18.4 # A post-3.19 version
-# version=3.24.30.1 # A future version, with incompatible API changes
 # See http://omahaproxy.appspot.com/ for the current stable/beta/dev versions of v8
 
 src_url=http://commondatastorage.googleapis.com/chromium-browser-official/v8-$version.tar.bz2
@@ -34,6 +29,17 @@ pkg_install () {
             # Some versions of GCC 4.4 crash with "pure virtual method called" unless these flag are passed
             CXXFLAGS="${CXXFLAGS:-} -fno-function-sections -fno-inline-functions"
     esac
-    pkg_make $arch.release CXX=$CXX LINK=$CXX LINK.target=$CXX werror=no $makeflags CXXFLAGS="${CXXFLAGS:-} -Wno-error"
-    find "$build_dir/out/$arch.release/obj.target" -iname "*.o" | grep -v '\/preparser_lib\/' | xargs ${AR:-ar} cqs "$install_dir/lib/libv8.a"
+    mode=release
+    pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX werror=no $makeflags CXXFLAGS="${CXXFLAGS:-} -Wno-error"
+    for lib in "$build_dir/out/$arch.$mode/"*.a `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do
+        name=`basename $lib`
+        cp $lib "$install_dir/lib/${name/.$arch/}"
+    done
+    touch "$install_dir/lib/libv8.a" # Create a dummy libv8.a because the makefile looks for it
+}
+
+pkg_link-flags () {
+    for lib in libv8_{base,snapshot} libicu{i18n,uc,data}; do
+        echo "$install_dir/lib/$lib.a"
+    done
 }