Merge branch 'ci-update-v8-6.9' into 'master'

Noissue - update CI to use V8 6.9

See merge request eyeo/adblockplus/libadblockplus!19

Author: xxxz

.travis.yml

@@ -22,16 +22,19 @@ env:
   - ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b
   - libv8_show_warnings="true"
   matrix:
+# 6.9.427.22
+  - V8_COMMIT=9a7be49a7a6e435d8a7d435c4879340a3cc7524c ABP_OS_SCRIPT=nix
+  - V8_COMMIT=9a7be49a7a6e435d8a7d435c4879340a3cc7524c ABP_OS_SCRIPT=android
 # 6.7.288.11
   - V8_COMMIT=4fc9a2fe7f8a7ef1e7966185b39b3b541792669a ABP_OS_SCRIPT=nix
   - V8_COMMIT=4fc9a2fe7f8a7ef1e7966185b39b3b541792669a ABP_OS_SCRIPT=android
 
 matrix:
   exclude:
   - os: linux
-    env: V8_COMMIT=4fc9a2fe7f8a7ef1e7966185b39b3b541792669a ABP_OS_SCRIPT=nix
+    env: V8_COMMIT=9a7be49a7a6e435d8a7d435c4879340a3cc7524c ABP_OS_SCRIPT=nix
   - os: linux
-    env: V8_COMMIT=3cdaf01c4043e19965efc5ef48df5314960b898f ABP_OS_SCRIPT=nix
+    env: V8_COMMIT=4fc9a2fe7f8a7ef1e7966185b39b3b541792669a ABP_OS_SCRIPT=nix
 
 before_script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi

.travis/prepare-prebuilt-v8.sh

@@ -11,7 +11,7 @@ if [[ "${TARGET_OS}" != "android" ]]; then
 if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
 PREBUILT_V8_ARCHIVE=osx-x64-debug.tar.xz
 elif [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-PREBUILT_V8_ARCHIVE=u14.04-x64-debug.tar.xz
+PREBUILT_V8_ARCHIVE=u18.04-x64-debug.tar.xz
 fi
 fi
 

Makefile

@@ -58,7 +58,7 @@ endif
 
 TEST_EXECUTABLE = ${BUILD_DIR}/out/Debug/tests
 
-URL_PREFIX ?= "https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b541792669a/"
+URL_PREFIX ?= "https://v8.eyeofiles.com/v8-$(shell sed -nE 's/.*V8_COMMIT=([^\s]+) .*/\1/p' .travis.yml|head -n1)/"
 
 .PHONY: all test clean docs ensure_dependencies
 

appveyor.yml

@@ -23,7 +23,7 @@ install:
 
 environment:
   global:
-    URL_PREFIX: https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b541792669a/
+    URL_PREFIX: https://v8.eyeofiles.com/v8-9a7be49a7a6e435d8a7d435c4879340a3cc7524c/
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: ubuntu
     Configuration: Debug

common.gypi

@@ -15,10 +15,14 @@
         # See https://issues.adblockplus.org/ticket/4950
         # We might be able to do without after upgrading V8.
         'cflags_cc': [ '-fno-rtti', '-std=c++14', '-fexceptions', '-fpermissive', '-stdlib=libc++' ],
-        'cflags!': [ '-Werror', ],
-        'ldflags': [ '-pthread', ],
+        'ldflags': [ '-pthread'],
       },
     }],
+    ['OS=="linux"', {
+      'target_defaults': {
+        'ldflags': ['-lc++']
+      }
+    }],
     ['OS=="mac"', {
       'xcode_settings': {
         'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',