Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit 1459c35

Browse files
committed
Revert Travis hacks and attempt to use bundled ld
1 parent e4aaa8a commit 1459c35

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ addons:
3636
bundler_args: --jobs=4 --retry=3
3737
before_install:
3838
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then gem update bundler; fi
39-
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
40-
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y --only-upgrade binutils; fi
4139
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo gem install bundler; fi
4240
script:
4341
- git submodule update --init

ext/libv8/builder.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def gyp_defines(*defines)
3030
defines << 'v8_use_external_startup_data=0'
3131

3232
# Do not use the GPLv3 ld.gold binary on Linux
33-
defines << 'linux_use_bundled_gold=0'
33+
#defines << 'linux_use_bundled_gold=0'
3434

3535
# Pass clang flag to GYP in order to work around GCC compilation failures
3636
defines << "clang=#{@compiler.is_a?(Compiler::Clang) ? '1' : '0'}"
@@ -64,7 +64,7 @@ def build_libv8!
6464
print_build_info
6565
puts 'Beginning compilation. This will take some time.'
6666

67-
command = "env CXX=#{Shellwords.escape @compiler.to_s} LINK=#{Shellwords.escape @compiler.to_s} #{make} #{make_flags}"
67+
command = "env CXX=#{Shellwords.escape @compiler.to_s} #{make} #{make_flags}"
6868
puts "Building v8 with #{command}"
6969
system command
7070
end

0 commit comments

Comments
 (0)