[build] Manuelly roll and fix build
Manually rolls:
5488ca8df..53a7b319
Fixes gyp build after:
https: //codereview.chromium.org/2900193003
Change-Id: I0249aa7d1c40bcb1533c56577bfbda4aedd8cbf9
Reviewed-on: https://chromium-review.googlesource.com/518144
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45564}
This commit is contained in:
parent
e822488d76
commit
8f7af5fb13
2
DEPS
2
DEPS
@ -8,7 +8,7 @@ vars = {
|
|||||||
|
|
||||||
deps = {
|
deps = {
|
||||||
"v8/build":
|
"v8/build":
|
||||||
Var("chromium_url") + "/chromium/src/build.git" + "@" + "5488ca8df80a453c5c686e61be9c953f690a5463",
|
Var("chromium_url") + "/chromium/src/build.git" + "@" + "53a7b319829ddaed28556ccb281630b7fca167ca",
|
||||||
"v8/tools/gyp":
|
"v8/tools/gyp":
|
||||||
Var("chromium_url") + "/external/gyp.git" + "@" + "eb296f67da078ec01f5e3a9ea9cdc6d26d680161",
|
Var("chromium_url") + "/external/gyp.git" + "@" + "eb296f67da078ec01f5e3a9ea9cdc6d26d680161",
|
||||||
"v8/third_party/icu":
|
"v8/third_party/icu":
|
||||||
|
@ -696,12 +696,15 @@
|
|||||||
['sysroot!="" and clang==1', {
|
['sysroot!="" and clang==1', {
|
||||||
'target_conditions': [
|
'target_conditions': [
|
||||||
['_toolset=="target"', {
|
['_toolset=="target"', {
|
||||||
|
'variables': {
|
||||||
|
'ld_paths': ['<!(<(DEPTH)/build/linux/sysroot_ld_path.sh <(sysroot))'],
|
||||||
|
},
|
||||||
'cflags': [
|
'cflags': [
|
||||||
'--sysroot=<(sysroot)',
|
'--sysroot=<(sysroot)',
|
||||||
],
|
],
|
||||||
'ldflags': [
|
'ldflags': [
|
||||||
'--sysroot=<(sysroot)',
|
'--sysroot=<(sysroot)',
|
||||||
'<!(<(DEPTH)/build/linux/sysroot_ld_path.sh <(sysroot))',
|
'<!(<(base_dir)/gypfiles/sysroot_ld_flags.sh <@(ld_paths))',
|
||||||
],
|
],
|
||||||
}]]
|
}]]
|
||||||
}],
|
}],
|
||||||
|
12
gypfiles/sysroot_ld_flags.sh
Executable file
12
gypfiles/sysroot_ld_flags.sh
Executable file
@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Copyright 2017 the V8 project authors. All rights reserved.
|
||||||
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
|
# found in the LICENSE file.
|
||||||
|
|
||||||
|
# This is for backwards-compatibility after:
|
||||||
|
# https://codereview.chromium.org/2900193003
|
||||||
|
|
||||||
|
for entry in $@; do
|
||||||
|
echo -L$entry
|
||||||
|
echo -Wl,-rpath-link=$entry
|
||||||
|
done | xargs echo
|
Loading…
Reference in New Issue
Block a user