Commit 7f024dbd authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Fix gn bootstrap build with --use-custom-libcxx

This is needed to fix the "Build From Tarball" bot:
https://ci.chromium.org/p/infra/builders/cron/Build%20From%20Tarball

R=thakis

Bug: 1047860
Change-Id: Id41ebee75dc760580b1d2334dffcbb5fc2004f32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033904
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737525}
parent 11b78e40
......@@ -23,8 +23,10 @@ rule link
build $libcxx/algorithm.o: cxx_libcxx $buildtools/$libcxx/algorithm.cpp
build $libcxx/any.o: cxx_libcxx $buildtools/$libcxx/any.cpp
build $libcxx/bind.o: cxx_libcxx $buildtools/$libcxx/bind.cpp
build $libcxx/charconv.o: cxx_libcxx $buildtools/$libcxx/charconv.cpp
build $libcxx/chrono.o: cxx_libcxx $buildtools/$libcxx/chrono.cpp
build $libcxx/condition_variable.o: cxx_libcxx $buildtools/$libcxx/condition_variable.cpp
build $libcxx/condition_variable_destructor.o: cxx_libcxx $buildtools/$libcxx/condition_variable_destructor.cpp
build $libcxx/debug.o: cxx_libcxx $buildtools/$libcxx/debug.cpp
build $libcxx/exception.o: cxx_libcxx $buildtools/$libcxx/exception.cpp
build $libcxx/functional.o: cxx_libcxx $buildtools/$libcxx/functional.cpp
......@@ -35,6 +37,7 @@ build $libcxx/iostream.o: cxx_libcxx $buildtools/$libcxx/iostream.cpp
build $libcxx/locale.o: cxx_libcxx $buildtools/$libcxx/locale.cpp
build $libcxx/memory.o: cxx_libcxx $buildtools/$libcxx/memory.cpp
build $libcxx/mutex.o: cxx_libcxx $buildtools/$libcxx/mutex.cpp
build $libcxx/mutex_destructor.o: cxx_libcxx $buildtools/$libcxx/mutex_destructor.cpp
build $libcxx/new.o: cxx_libcxx $buildtools/$libcxx/new.cpp
build $libcxx/optional.o: cxx_libcxx $buildtools/$libcxx/optional.cpp
build $libcxx/random.o: cxx_libcxx $buildtools/$libcxx/random.cpp
......@@ -68,4 +71,4 @@ build $libcxxabi/stdlib_exception.o: cxx_libcxxabi $buildtools/$libcxxabi/stdlib
build $libcxxabi/stdlib_stdexcept.o: cxx_libcxxabi $buildtools/$libcxxabi/stdlib_stdexcept.cpp
build $libcxxabi/stdlib_typeinfo.o: cxx_libcxxabi $buildtools/$libcxxabi/stdlib_typeinfo.cpp
build ../libc++.gn.so: link $libcxx/algorithm.o $libcxx/any.o $libcxx/bind.o $libcxx/chrono.o $libcxx/condition_variable.o $libcxx/debug.o $libcxx/exception.o $libcxx/functional.o $libcxx/future.o $libcxx/hash.o $libcxx/ios.o $libcxx/iostream.o $libcxx/locale.o $libcxx/memory.o $libcxx/mutex.o $libcxx/new.o $libcxx/optional.o $libcxx/random.o $libcxx/regex.o $libcxx/shared_mutex.o $libcxx/stdexcept.o $libcxx/string.o $libcxx/strstream.o $libcxx/system_error.o $libcxx/thread.o $libcxx/typeinfo.o $libcxx/utility.o $libcxx/valarray.o $libcxx/variant.o $libcxx/vector.o $libcxxabi/abort_message.o $libcxxabi/cxa_aux_runtime.o $libcxxabi/cxa_default_handlers.o $libcxxabi/cxa_demangle.o $libcxxabi/cxa_exception_storage.o $libcxxabi/cxa_guard.o $libcxxabi/cxa_handlers.o $libcxxabi/cxa_noexception.o $libcxxabi/cxa_unexpected.o $libcxxabi/cxa_vector.o $libcxxabi/cxa_virtual.o $libcxxabi/fallback_malloc.o $libcxxabi/private_typeinfo.o $libcxxabi/stdlib_exception.o $libcxxabi/stdlib_stdexcept.o $libcxxabi/stdlib_typeinfo.o
build ../libc++.gn.so: link $libcxx/algorithm.o $libcxx/any.o $libcxx/bind.o $libcxx/charconv.o $libcxx/chrono.o $libcxx/condition_variable.o $libcxx/condition_variable_destructor.o $libcxx/debug.o $libcxx/exception.o $libcxx/functional.o $libcxx/future.o $libcxx/hash.o $libcxx/ios.o $libcxx/iostream.o $libcxx/locale.o $libcxx/memory.o $libcxx/mutex.o $libcxx/mutex_destructor.o $libcxx/new.o $libcxx/optional.o $libcxx/random.o $libcxx/regex.o $libcxx/shared_mutex.o $libcxx/stdexcept.o $libcxx/string.o $libcxx/strstream.o $libcxx/system_error.o $libcxx/thread.o $libcxx/typeinfo.o $libcxx/utility.o $libcxx/valarray.o $libcxx/variant.o $libcxx/vector.o $libcxxabi/abort_message.o $libcxxabi/cxa_aux_runtime.o $libcxxabi/cxa_default_handlers.o $libcxxabi/cxa_demangle.o $libcxxabi/cxa_exception_storage.o $libcxxabi/cxa_guard.o $libcxxabi/cxa_handlers.o $libcxxabi/cxa_noexception.o $libcxxabi/cxa_unexpected.o $libcxxabi/cxa_vector.o $libcxxabi/cxa_virtual.o $libcxxabi/fallback_malloc.o $libcxxabi/private_typeinfo.o $libcxxabi/stdlib_exception.o $libcxxabi/stdlib_stdexcept.o $libcxxabi/stdlib_typeinfo.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment