From 520bbd892ada57a5c93680eae3c9d7eb691073af Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Tue, 14 Dec 2021 13:54:39 -0500 Subject: Clean up Ninja files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make a number of minor improvements to the EC’s Ninja build files. – Rewrap Ninja code to 80 characters. – Factor out more flags into common_cxxflags. – Remove the antlrdep rule (which was left over from earlier experimentation) and some spurious `-D` flags in release.ninja (which appeared when I copy-pasted this build structure from another project). --- buildconf/common.ninja | 305 +++++++++++++++++++++++++++++++----------------- buildconf/release.ninja | 6 +- 2 files changed, 202 insertions(+), 109 deletions(-) diff --git a/buildconf/common.ninja b/buildconf/common.ninja index d31a1b4..256df10 100644 --- a/buildconf/common.ninja +++ b/buildconf/common.ninja @@ -19,21 +19,18 @@ absl = third_party/abseil/absl antlrflags = -no-listener -visitor -package ec -common_cxxflags = -I. -isystem third_party/abseil -I/usr/include/antlr4-runtime -isystem /usr/include/antlr4-runtime -DGTEST_HAS_PTHREAD=1 -pipe -pthread - -cxxflags = $common_cxxflags -std=c++17 -Wall -Wextra -Wno-logical-op-parentheses -Wno-sign-compare -fdiagnostics-show-template-tree $cxxflags -third_party_cxxflags = $common_cxxflags -std=c++17 -fdiagnostics-show-template-tree $third_party_cxxflags - +common_cxxflags = -I. -isystem third_party/abseil $ + -I/usr/include/antlr4-runtime -isystem /usr/include/antlr4-runtime $ + -DGTEST_HAS_PTHREAD=1 -pipe -pthread -std=c++17 $ + -fdiagnostics-show-template-tree +cxxflags = $common_cxxflags -Wall -Wextra -Wno-logical-op-parentheses $ + -Wno-sign-compare $cxxflags third_party_cxxflags = $common_cxxflags $third_party_cxxflags rule antlr command = antlr4 $antlrflags $in description = Generating parser from $in -rule antlrdep - command = gen/antlr4_dyndep $antlrflags $in >$out - description = Computing outputs from $in - rule ar command = rm -f $out && ar -rcs $out $in description = Generating $out @@ -48,7 +45,11 @@ rule link command = g++ $ldflags -o $out $in $libs -pthread description = Linking $out -build | src/CalculatorBaseVisitor.cpp src/CalculatorBaseVisitor.h src/Calculator.interp src/CalculatorLexer.cpp src/CalculatorLexer.h src/CalculatorLexer.interp src/CalculatorLexer.tokens src/CalculatorParser.cpp src/CalculatorParser.h src/Calculator.tokens src/CalculatorVisitor.cpp src/CalculatorVisitor.h: antlr src/Calculator.g4 +build | src/CalculatorBaseVisitor.cpp src/CalculatorBaseVisitor.h $ + src/Calculator.interp src/CalculatorLexer.cpp src/CalculatorLexer.h $ + src/CalculatorLexer.interp src/CalculatorLexer.tokens $ + src/CalculatorParser.cpp src/CalculatorParser.h src/Calculator.tokens $ + src/CalculatorVisitor.cpp src/CalculatorVisitor.h: antlr src/Calculator.g4 build src/CalculatorBaseVisitor.o: cxx src/CalculatorBaseVisitor.cpp cxxflags = $third_party_cxxflags @@ -61,40 +62,92 @@ build src/CalculatorVisitor.o: cxx src/CalculatorVisitor.cpp build src/builtin.o: cxx src/builtin.cc build src/language.o: cxx src/language.cc build src/main.o: cxx src/main.cc -build src/parser_driver.o: cxx src/parser_driver.cc || src/CalculatorBaseVisitor.h src/CalculatorLexer.h src/CalculatorParser.h +build src/parser_driver.o: cxx src/parser_driver.cc || $ + src/CalculatorBaseVisitor.h src/CalculatorLexer.h src/CalculatorParser.h build src/ui/stream.o: cxx src/ui/stream.cc build src/ui/terminal.o: cxx src/ui/terminal.cc build src/ui/terminal/line.o: cxx src/ui/terminal/line.cc build src/util.o: cxx src/util.cc build src/builtin_test.o: cxx src/builtin_test.cc -build src/builtin_test: link $ - src/builtin.o src/builtin_test.o src/language.o $ - $absl/strings/cord.a $absl/strings/cordz_info.a $absl/strings/cord_internal.a $absl/strings/cordz_functions.a $absl/strings/cordz_handle.a $absl/hash/hash.a $absl/hash/city.a $absl/types/bad_variant_access.a $absl/hash/low_level_hash.a $absl/container/raw_hash_set.a $absl/types/bad_optional_access.a $absl/container/hashtablez_sampler.a $absl/profiling/exponential_biased.a $absl/synchronization/synchronization.a $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a third_party/abseil/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $absl/base/raw_logging_internal.a $absl/base/log_severity.a +build src/builtin_test: link src/builtin.o src/builtin_test.o src/language.o $ + $absl/strings/cord.a $absl/strings/cordz_info.a $ + $absl/strings/cord_internal.a $absl/strings/cordz_functions.a $ + $absl/strings/cordz_handle.a $absl/hash/hash.a $absl/hash/city.a $ + $absl/types/bad_variant_access.a $absl/hash/low_level_hash.a $ + $absl/container/raw_hash_set.a $absl/types/bad_optional_access.a $ + $absl/container/hashtablez_sampler.a $absl/profiling/exponential_biased.a $ + $absl/synchronization/synchronization.a $ + $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $ + $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $ + $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a $ + $absl/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $ + $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $ + $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $ + $absl/base/raw_logging_internal.a $absl/base/log_severity.a libs = -lgmock_main -lgmock -lgtest -lm -lrt build src/language_test.o: cxx src/language_test.cc -build src/language_test: link $ - src/builtin.o src/language.o src/language_test.o $ - $absl/strings/cord.a $absl/strings/cordz_info.a $absl/strings/cord_internal.a $absl/strings/cordz_functions.a $absl/strings/cordz_handle.a $absl/hash/hash.a $absl/hash/city.a $absl/types/bad_variant_access.a $absl/hash/low_level_hash.a $absl/container/raw_hash_set.a $absl/types/bad_optional_access.a $absl/container/hashtablez_sampler.a $absl/profiling/exponential_biased.a $absl/synchronization/synchronization.a $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a third_party/abseil/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $absl/base/raw_logging_internal.a $absl/base/log_severity.a +build src/language_test: link src/builtin.o src/language.o src/language_test.o $ + $absl/strings/cord.a $absl/strings/cordz_info.a $ + $absl/strings/cord_internal.a $absl/strings/cordz_functions.a $ + $absl/strings/cordz_handle.a $absl/hash/hash.a $absl/hash/city.a $ + $absl/types/bad_variant_access.a $absl/hash/low_level_hash.a $ + $absl/container/raw_hash_set.a $absl/types/bad_optional_access.a $ + $absl/container/hashtablez_sampler.a $absl/profiling/exponential_biased.a $ + $absl/synchronization/synchronization.a $ + $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $ + $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $ + $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a $ + $absl/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $ + $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $ + $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $ + $absl/base/raw_logging_internal.a $absl/base/log_severity.a libs = -lgmock_main -lgmock -lgtest -lrt build src/parser_driver_test.o: cxx src/parser_driver_test.cc -build src/parser_driver_test: link $ - src/builtin.o src/CalculatorBaseVisitor.o src/CalculatorLexer.o src/CalculatorParser.o src/CalculatorVisitor.o src/language.o src/parser_driver.o src/parser_driver_test.o $ - $absl/strings/cord.a $absl/strings/cordz_info.a $absl/strings/cord_internal.a $absl/strings/cordz_functions.a $absl/strings/cordz_handle.a $absl/hash/hash.a $absl/hash/city.a $absl/types/bad_variant_access.a $absl/hash/low_level_hash.a $absl/container/raw_hash_set.a $absl/types/bad_optional_access.a $absl/container/hashtablez_sampler.a $absl/profiling/exponential_biased.a $absl/synchronization/synchronization.a $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a third_party/abseil/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $absl/base/raw_logging_internal.a $absl/base/log_severity.a +build src/parser_driver_test: link src/builtin.o src/CalculatorBaseVisitor.o $ + src/CalculatorLexer.o src/CalculatorParser.o src/CalculatorVisitor.o $ + src/language.o src/parser_driver.o src/parser_driver_test.o $ + $absl/strings/cord.a $absl/strings/cordz_info.a $ + $absl/strings/cord_internal.a $absl/strings/cordz_functions.a $ + $absl/strings/cordz_handle.a $absl/hash/hash.a $absl/hash/city.a $ + $absl/types/bad_variant_access.a $absl/hash/low_level_hash.a $ + $absl/container/raw_hash_set.a $absl/types/bad_optional_access.a $ + $absl/container/hashtablez_sampler.a $absl/profiling/exponential_biased.a $ + $absl/synchronization/synchronization.a $ + $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $ + $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $ + $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a $ + $absl/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $ + $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $ + $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $ + $absl/base/raw_logging_internal.a $absl/base/log_severity.a libs = -lgmock_main -lgmock -lgtest -lantlr4-runtime -lrt -build ec: link $ - src/CalculatorBaseVisitor.o src/CalculatorLexer.o src/CalculatorParser.o src/CalculatorVisitor.o src/builtin.o src/language.o src/main.o src/parser_driver.o src/util.o src/ui/stream.o src/ui/terminal.o src/ui/terminal/line.o $ - $absl/strings/cord.a $absl/strings/cordz_info.a $absl/strings/cord_internal.a $absl/strings/cordz_functions.a $absl/strings/cordz_handle.a $absl/hash/hash.a $absl/hash/city.a $absl/types/bad_variant_access.a $absl/hash/low_level_hash.a $absl/container/raw_hash_set.a $absl/types/bad_optional_access.a $absl/container/hashtablez_sampler.a $absl/profiling/exponential_biased.a $absl/synchronization/synchronization.a $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a third_party/abseil/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $absl/base/raw_logging_internal.a $absl/base/log_severity.a +build ec: link src/CalculatorBaseVisitor.o src/CalculatorLexer.o $ + src/CalculatorParser.o src/CalculatorVisitor.o src/builtin.o $ + src/language.o src/main.o src/parser_driver.o src/util.o src/ui/stream.o $ + src/ui/terminal.o src/ui/terminal/line.o $absl/strings/cord.a $ + $absl/strings/cordz_info.a $absl/strings/cord_internal.a $ + $absl/strings/cordz_functions.a $absl/strings/cordz_handle.a $ + $absl/hash/hash.a $absl/hash/city.a $absl/types/bad_variant_access.a $ + $absl/hash/low_level_hash.a $absl/container/raw_hash_set.a $ + $absl/types/bad_optional_access.a $absl/container/hashtablez_sampler.a $ + $absl/profiling/exponential_biased.a $ + $absl/synchronization/synchronization.a $ + $absl/synchronization/graphcycles_internal.a $absl/debugging/stacktrace.a $ + $absl/debugging/symbolize.a $absl/debugging/debugging_internal.a $ + $absl/debugging/demangle_internal.a $absl/base/malloc_internal.a $ + $absl/time/time.a $absl/time/civil_time.a $absl/strings/strings.a $ + $absl/strings/internal.a $absl/base/base.a $absl/base/spinlock_wait.a $ + $absl/numeric/int128.a $absl/time/time_zone.a $absl/base/throw_delegate.a $ + $absl/base/raw_logging_internal.a $absl/base/log_severity.a libs = -lantlr4-runtime -lm -lrt # //absl/base -build $absl/base/base.a: ar $ - $absl/base/internal/cycleclock.o $ - $absl/base/internal/spinlock.o $ - $absl/base/internal/sysinfo.o $ +build $absl/base/base.a: ar $absl/base/internal/cycleclock.o $ + $absl/base/internal/spinlock.o $absl/base/internal/sysinfo.o $ $absl/base/internal/thread_identity.o $ $absl/base/internal/unscaledcycleclock.o build $absl/base/internal/cycleclock.o: cxx $absl/base/internal/cycleclock.cc @@ -103,9 +156,11 @@ build $absl/base/internal/spinlock.o: cxx $absl/base/internal/spinlock.cc cxxflags = $third_party_cxxflags build $absl/base/internal/sysinfo.o: cxx $absl/base/internal/sysinfo.cc cxxflags = $third_party_cxxflags -build $absl/base/internal/thread_identity.o: cxx $absl/base/internal/thread_identity.cc +build $absl/base/internal/thread_identity.o: cxx $ + $absl/base/internal/thread_identity.cc cxxflags = $third_party_cxxflags -build $absl/base/internal/unscaledcycleclock.o: cxx $absl/base/internal/unscaledcycleclock.cc +build $absl/base/internal/unscaledcycleclock.o: cxx $ + $absl/base/internal/unscaledcycleclock.cc cxxflags = $third_party_cxxflags # //absl/base:log_severity @@ -115,7 +170,8 @@ build $absl/base/log_severity.o: cxx $absl/base/log_severity.cc # //absl/base:malloc_internal build $absl/base/malloc_internal.a: ar $absl/base/internal/low_level_alloc.o -build $absl/base/internal/low_level_alloc.o: cxx $absl/base/internal/low_level_alloc.cc +build $absl/base/internal/low_level_alloc.o: cxx $ + $absl/base/internal/low_level_alloc.cc cxxflags = $third_party_cxxflags # //absl/base:raw_logging_internal @@ -125,26 +181,32 @@ build $absl/base/internal/raw_logging.o: cxx $absl/base/internal/raw_logging.cc # //absl/base:spinlock_wait build $absl/base/spinlock_wait.a: ar $absl/base/internal/spinlock_wait.o -build $absl/base/internal/spinlock_wait.o: cxx $absl/base/internal/spinlock_wait.cc | $absl/base/internal/spinlock_linux.inc +build $absl/base/internal/spinlock_wait.o: cxx $ + $absl/base/internal/spinlock_wait.cc | $ + $absl/base/internal/spinlock_linux.inc cxxflags = $third_party_cxxflags # //absl/base:throw_delegate build $absl/base/throw_delegate.a: ar $absl/base/internal/throw_delegate.o -build $absl/base/internal/throw_delegate.o: cxx $absl/base/internal/throw_delegate.cc +build $absl/base/internal/throw_delegate.o: cxx $ + $absl/base/internal/throw_delegate.cc cxxflags = $third_party_cxxflags # //absl/container:hashtablez_sampler build $absl/container/hashtablez_sampler.a: ar $ $absl/container/internal/hashtablez_sampler.o $ $absl/container/internal/hashtablez_sampler_force_weak_definition.o -build $absl/container/internal/hashtablez_sampler.o: cxx $absl/container/internal/hashtablez_sampler.cc +build $absl/container/internal/hashtablez_sampler.o: cxx $ + $absl/container/internal/hashtablez_sampler.cc cxxflags = $third_party_cxxflags -build $absl/container/internal/hashtablez_sampler_force_weak_definition.o: cxx $absl/container/internal/hashtablez_sampler_force_weak_definition.cc +build $absl/container/internal/hashtablez_sampler_force_weak_definition.o: cxx $ + $absl/container/internal/hashtablez_sampler_force_weak_definition.cc cxxflags = $third_party_cxxflags # //absl/container:raw_hash_set build $absl/container/raw_hash_set.a: ar $absl/container/internal/raw_hash_set.o -build $absl/container/internal/raw_hash_set.o: cxx $absl/container/internal/raw_hash_set.cc +build $absl/container/internal/raw_hash_set.o: cxx $ + $absl/container/internal/raw_hash_set.cc cxxflags = $third_party_cxxflags # //absl/debugging:debugging_internal @@ -152,26 +214,34 @@ build $absl/debugging/debugging_internal.a: ar $ $absl/debugging/internal/address_is_readable.o $ $absl/debugging/internal/elf_mem_image.o $ $absl/debugging/internal/vdso_support.o -build $absl/debugging/internal/address_is_readable.o: cxx $absl/debugging/internal/address_is_readable.cc +build $absl/debugging/internal/address_is_readable.o: cxx $ + $absl/debugging/internal/address_is_readable.cc cxxflags = $third_party_cxxflags -build $absl/debugging/internal/elf_mem_image.o: cxx $absl/debugging/internal/elf_mem_image.cc +build $absl/debugging/internal/elf_mem_image.o: cxx $ + $absl/debugging/internal/elf_mem_image.cc cxxflags = $third_party_cxxflags -build $absl/debugging/internal/vdso_support.o: cxx $absl/debugging/internal/vdso_support.cc +build $absl/debugging/internal/vdso_support.o: cxx $ + $absl/debugging/internal/vdso_support.cc cxxflags = $third_party_cxxflags # //absl:debugging:demangle_internal -build $absl/debugging/demangle_internal.a: ar $absl/debugging/internal/demangle.o -build $absl/debugging/internal/demangle.o: cxx $absl/debugging/internal/demangle.cc +build $absl/debugging/demangle_internal.a: ar $ + $absl/debugging/internal/demangle.o +build $absl/debugging/internal/demangle.o: cxx $ + $absl/debugging/internal/demangle.cc cxxflags = $third_party_cxxflags # //absl/debugging:stacktrace build $absl/debugging/stacktrace.a: ar $absl/debugging/stacktrace.o -build $absl/debugging/stacktrace.o: cxx $absl/debugging/stacktrace.cc | $absl/debugging/internal/stacktrace_config.h $absl/debugging/internal/stacktrace_x86-inl.inc +build $absl/debugging/stacktrace.o: cxx $absl/debugging/stacktrace.cc | $ + $absl/debugging/internal/stacktrace_config.h $ + $absl/debugging/internal/stacktrace_x86-inl.inc cxxflags = $third_party_cxxflags # //absl/debugging:symbolize build $absl/debugging/symbolize.a: ar $absl/debugging/symbolize.o -build $absl/debugging/symbolize.o: cxx $absl/debugging/symbolize.cc | $absl/debugging/symbolize_elf.inc +build $absl/debugging/symbolize.o: cxx $absl/debugging/symbolize.cc | $ + $absl/debugging/symbolize_elf.inc cxxflags = $third_party_cxxflags # //absl/hash @@ -186,43 +256,43 @@ build $absl/hash/internal/city.o: cxx $absl/hash/internal/city.cc # //absl/hash:low_level_hash build $absl/hash/low_level_hash.a: ar $absl/hash/internal/low_level_hash.o -build $absl/hash/internal/low_level_hash.o: cxx $absl/hash/internal/low_level_hash.cc +build $absl/hash/internal/low_level_hash.o: cxx $ + $absl/hash/internal/low_level_hash.cc cxxflags = $third_party_cxxflags # //absl/numeric:int128 build $absl/numeric/int128.a: ar $absl/numeric/int128.o -build $absl/numeric/int128.o: cxx $absl/numeric/int128.cc | $absl/numeric/int128_have_intrinsic.inc $absl/numeric/int128_no_intrinsic.inc +build $absl/numeric/int128.o: cxx $absl/numeric/int128.cc | $ + $absl/numeric/int128_have_intrinsic.inc $ + $absl/numeric/int128_no_intrinsic.inc cxxflags = $third_party_cxxflags # //absl/profiling:exponential_biased -build $absl/profiling/exponential_biased.a: ar $absl/profiling/internal/exponential_biased.o -build $absl/profiling/internal/exponential_biased.o: cxx $absl/profiling/internal/exponential_biased.cc +build $absl/profiling/exponential_biased.a: ar $ + $absl/profiling/internal/exponential_biased.o +build $absl/profiling/internal/exponential_biased.o: cxx $ + $absl/profiling/internal/exponential_biased.cc cxxflags = $third_party_cxxflags # //absl/strings -build $absl/strings/strings.a: ar $ - $absl/strings/ascii.o $ - $absl/strings/charconv.o $ - $absl/strings/escaping.o $ +build $absl/strings/strings.a: ar $absl/strings/ascii.o $ + $absl/strings/charconv.o $absl/strings/escaping.o $ $absl/strings/internal/charconv_bigint.o $ - $absl/strings/internal/charconv_parse.o $ - $absl/strings/internal/memutil.o $ - $absl/strings/match.o $ - $absl/strings/numbers.o $ - $absl/strings/str_cat.o $ - $absl/strings/str_replace.o $ - $absl/strings/str_split.o $ - $absl/strings/string_view.o $ - $absl/strings/substitute.o + $absl/strings/internal/charconv_parse.o $absl/strings/internal/memutil.o $ + $absl/strings/match.o $absl/strings/numbers.o $absl/strings/str_cat.o $ + $absl/strings/str_replace.o $absl/strings/str_split.o $ + $absl/strings/string_view.o $absl/strings/substitute.o build $absl/strings/ascii.o: cxx $absl/strings/ascii.cc cxxflags = $third_party_cxxflags build $absl/strings/charconv.o: cxx $absl/strings/charconv.cc cxxflags = $third_party_cxxflags build $absl/strings/escaping.o: cxx $absl/strings/escaping.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/charconv_bigint.o: cxx $absl/strings/internal/charconv_bigint.cc +build $absl/strings/internal/charconv_bigint.o: cxx $ + $absl/strings/internal/charconv_bigint.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/charconv_parse.o: cxx $absl/strings/internal/charconv_parse.cc +build $absl/strings/internal/charconv_parse.o: cxx $ + $absl/strings/internal/charconv_parse.cc cxxflags = $third_party_cxxflags build $absl/strings/internal/memutil.o: cxx $absl/strings/internal/memutil.cc cxxflags = $third_party_cxxflags @@ -247,92 +317,102 @@ build $absl/strings/cord.o: cxx $absl/strings/cord.cc cxxflags = $third_party_cxxflags # //absl/strings:cord_internal -build $absl/strings/cord_internal.a: ar $ - $absl/strings/internal/cord_internal.o $ +build $absl/strings/cord_internal.a: ar $absl/strings/internal/cord_internal.o $ $absl/strings/internal/cord_rep_btree.o $ $absl/strings/internal/cord_rep_btree_navigator.o $ $absl/strings/internal/cord_rep_btree_reader.o $ $absl/strings/internal/cord_rep_consume.o $ $absl/strings/internal/cord_rep_ring.o -build $absl/strings/internal/cord_internal.o: cxx $absl/strings/internal/cord_internal.cc +build $absl/strings/internal/cord_internal.o: cxx $ + $absl/strings/internal/cord_internal.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/cord_rep_btree.o: cxx $absl/strings/internal/cord_rep_btree.cc +build $absl/strings/internal/cord_rep_btree.o: cxx $ + $absl/strings/internal/cord_rep_btree.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/cord_rep_btree_navigator.o: cxx $absl/strings/internal/cord_rep_btree_navigator.cc +build $absl/strings/internal/cord_rep_btree_navigator.o: cxx $ + $absl/strings/internal/cord_rep_btree_navigator.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/cord_rep_btree_reader.o: cxx $absl/strings/internal/cord_rep_btree_reader.cc +build $absl/strings/internal/cord_rep_btree_reader.o: cxx $ + $absl/strings/internal/cord_rep_btree_reader.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/cord_rep_consume.o: cxx $absl/strings/internal/cord_rep_consume.cc +build $absl/strings/internal/cord_rep_consume.o: cxx $ + $absl/strings/internal/cord_rep_consume.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/cord_rep_ring.o: cxx $absl/strings/internal/cord_rep_ring.cc +build $absl/strings/internal/cord_rep_ring.o: cxx $ + $absl/strings/internal/cord_rep_ring.cc cxxflags = $third_party_cxxflags # //absl/strings:cordz_functions -build $absl/strings/cordz_functions.a: ar $absl/strings/internal/cordz_functions.o -build $absl/strings/internal/cordz_functions.o: cxx $absl/strings/internal/cordz_functions.cc +build $absl/strings/cordz_functions.a: ar $ + $absl/strings/internal/cordz_functions.o +build $absl/strings/internal/cordz_functions.o: cxx $ + $absl/strings/internal/cordz_functions.cc cxxflags = $third_party_cxxflags # //absl/strings:cordz_handle build $absl/strings/cordz_handle.a: ar $absl/strings/internal/cordz_handle.o -build $absl/strings/internal/cordz_handle.o: cxx $absl/strings/internal/cordz_handle.cc +build $absl/strings/internal/cordz_handle.o: cxx $ + $absl/strings/internal/cordz_handle.cc cxxflags = $third_party_cxxflags # //absl/strings:cordz_info build $absl/strings/cordz_info.a: ar $absl/strings/internal/cordz_info.o -build $absl/strings/internal/cordz_info.o: cxx $absl/strings/internal/cordz_info.cc +build $absl/strings/internal/cordz_info.o: cxx $ + $absl/strings/internal/cordz_info.cc cxxflags = $third_party_cxxflags # //absl/strings:internal -build $absl/strings/internal.a: ar $ - $absl/strings/internal/escaping.o $ - $absl/strings/internal/ostringstream.o $ - $absl/strings/internal/utf8.o +build $absl/strings/internal.a: ar $absl/strings/internal/escaping.o $ + $absl/strings/internal/ostringstream.o $absl/strings/internal/utf8.o build $absl/strings/internal/escaping.o: cxx $absl/strings/internal/escaping.cc cxxflags = $third_party_cxxflags -build $absl/strings/internal/ostringstream.o: cxx $absl/strings/internal/ostringstream.cc +build $absl/strings/internal/ostringstream.o: cxx $ + $absl/strings/internal/ostringstream.cc cxxflags = $third_party_cxxflags build $absl/strings/internal/utf8.o: cxx $absl/strings/internal/utf8.cc cxxflags = $third_party_cxxflags # //absl/synchronization build $absl/synchronization/synchronization.a: ar $ - $absl/synchronization/barrier.o $ - $absl/synchronization/blocking_counter.o $ + $absl/synchronization/barrier.o $absl/synchronization/blocking_counter.o $ $absl/synchronization/internal/create_thread_identity.o $ $absl/synchronization/internal/per_thread_sem.o $ $absl/synchronization/internal/waiter.o $ - $absl/synchronization/notification.o $ - $absl/synchronization/mutex.o + $absl/synchronization/notification.o $absl/synchronization/mutex.o build $absl/synchronization/barrier.o: cxx $absl/synchronization/barrier.cc cxxflags = $third_party_cxxflags -build $absl/synchronization/blocking_counter.o: cxx $absl/synchronization/blocking_counter.cc +build $absl/synchronization/blocking_counter.o: cxx $ + $absl/synchronization/blocking_counter.cc cxxflags = $third_party_cxxflags -build $absl/synchronization/internal/create_thread_identity.o: cxx $absl/synchronization/internal/create_thread_identity.cc +build $absl/synchronization/internal/create_thread_identity.o: cxx $ + $absl/synchronization/internal/create_thread_identity.cc cxxflags = $third_party_cxxflags -build $absl/synchronization/internal/per_thread_sem.o: cxx $absl/synchronization/internal/per_thread_sem.cc +build $absl/synchronization/internal/per_thread_sem.o: cxx $ + $absl/synchronization/internal/per_thread_sem.cc cxxflags = $third_party_cxxflags -build $absl/synchronization/internal/waiter.o: cxx $absl/synchronization/internal/waiter.cc +build $absl/synchronization/internal/waiter.o: cxx $ + $absl/synchronization/internal/waiter.cc cxxflags = $third_party_cxxflags -build $absl/synchronization/notification.o: cxx $absl/synchronization/notification.cc +build $absl/synchronization/notification.o: cxx $ + $absl/synchronization/notification.cc cxxflags = $third_party_cxxflags build $absl/synchronization/mutex.o: cxx $absl/synchronization/mutex.cc cxxflags = $third_party_cxxflags # //absl/synchronization:graphcycles_internal -build $absl/synchronization/graphcycles_internal.a: ar $absl/synchronization/internal/graphcycles.o -build $absl/synchronization/internal/graphcycles.o: cxx $absl/synchronization/internal/graphcycles.cc +build $absl/synchronization/graphcycles_internal.a: ar $ + $absl/synchronization/internal/graphcycles.o +build $absl/synchronization/internal/graphcycles.o: cxx $ + $absl/synchronization/internal/graphcycles.cc cxxflags = $third_party_cxxflags # //absl/time -build third_party/abseil/time/time.a: ar $ - $absl/time/civil_time.o $ - $absl/time/clock.o $ - $absl/time/duration.o $ - $absl/time/format.o $ - $absl/time/absl/time.o +build $absl/time/time.a: ar $absl/time/civil_time.o $absl/time/clock.o $ + $absl/time/duration.o $absl/time/format.o $absl/time/absl/time.o build $absl/time/civil_time.o: cxx $absl/time/civil_time.cc cxxflags = $third_party_cxxflags -build $absl/time/clock.o: cxx $absl/time/clock.cc | $absl/time/internal/get_current_time_posix.inc +build $absl/time/clock.o: cxx $absl/time/clock.cc | $ + $absl/time/internal/get_current_time_posix.inc cxxflags = $third_party_cxxflags build $absl/time/duration.o: cxx $absl/time/duration.cc cxxflags = $third_party_cxxflags @@ -342,8 +422,10 @@ build $absl/time/absl/time.o: cxx $absl/time/time.cc cxxflags = $third_party_cxxflags # //absl/time:civil_time -build $absl/time/civil_time.a: ar $absl/time/internal/cctz/src/civil_time_detail.o -build $absl/time/internal/cctz/src/civil_time_detail.o: cxx $absl/time/internal/cctz/src/civil_time_detail.cc +build $absl/time/civil_time.a: ar $ + $absl/time/internal/cctz/src/civil_time_detail.o +build $absl/time/internal/cctz/src/civil_time_detail.o: cxx $ + $absl/time/internal/cctz/src/civil_time_detail.cc cxxflags = $third_party_cxxflags # //absl/time:time_zone @@ -357,23 +439,32 @@ build $absl/time/time_zone.a: ar $ $absl/time/internal/cctz/src/time_zone_lookup.o $ $absl/time/internal/cctz/src/time_zone_posix.o $ $absl/time/internal/cctz/src/zone_info_source.o -build $absl/time/internal/cctz/src/time_zone_fixed.o: cxx $absl/time/internal/cctz/src/time_zone_fixed.cc +build $absl/time/internal/cctz/src/time_zone_fixed.o: cxx $ + $absl/time/internal/cctz/src/time_zone_fixed.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/time_zone_format.o: cxx $absl/time/internal/cctz/src/time_zone_format.cc +build $absl/time/internal/cctz/src/time_zone_format.o: cxx $ + $absl/time/internal/cctz/src/time_zone_format.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/time_zone_if.o: cxx $absl/time/internal/cctz/src/time_zone_if.cc +build $absl/time/internal/cctz/src/time_zone_if.o: cxx $ + $absl/time/internal/cctz/src/time_zone_if.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/time_zone_impl.o: cxx $absl/time/internal/cctz/src/time_zone_impl.cc +build $absl/time/internal/cctz/src/time_zone_impl.o: cxx $ + $absl/time/internal/cctz/src/time_zone_impl.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/time_zone_info.o: cxx $absl/time/internal/cctz/src/time_zone_info.cc +build $absl/time/internal/cctz/src/time_zone_info.o: cxx $ + $absl/time/internal/cctz/src/time_zone_info.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/time_zone_libc.o: cxx $absl/time/internal/cctz/src/time_zone_libc.cc +build $absl/time/internal/cctz/src/time_zone_libc.o: cxx $ + $absl/time/internal/cctz/src/time_zone_libc.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/time_zone_lookup.o: cxx $absl/time/internal/cctz/src/time_zone_lookup.cc +build $absl/time/internal/cctz/src/time_zone_lookup.o: cxx $ + $absl/time/internal/cctz/src/time_zone_lookup.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/time_zone_posix.o: cxx $absl/time/internal/cctz/src/time_zone_posix.cc +build $absl/time/internal/cctz/src/time_zone_posix.o: cxx $ + $absl/time/internal/cctz/src/time_zone_posix.cc cxxflags = $third_party_cxxflags -build $absl/time/internal/cctz/src/zone_info_source.o: cxx $absl/time/internal/cctz/src/zone_info_source.cc +build $absl/time/internal/cctz/src/zone_info_source.o: cxx $ + $absl/time/internal/cctz/src/zone_info_source.cc cxxflags = $third_party_cxxflags # // absl/types:bad_optional_access diff --git a/buildconf/release.ninja b/buildconf/release.ninja index 7b1281b..3774a0d 100644 --- a/buildconf/release.ninja +++ b/buildconf/release.ninja @@ -17,8 +17,10 @@ # # Most of these flags come from Debian's dpkg-buildflags, with the exception # that we aim for correctness with -O3, rather than just -O2. -cxxflags = -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -O3 -DNDEBUG -DGLPLANET_DISABLE_EGL_THREAD_SAFETY_CHECKS -DGLPLANET_DISABLE_GL_THREAD_SAFETY_CHECKS -DGLPLANET_DISABLE_AGGRESSIVE_ERROR_CHECKING -fstack-protector-strong -ffunction-sections -fdata-sections -flto -third_party_cxxflags = -D_FORTIFY_SOURCE=2 -O3 -DNDEBUG -fstack-protector-strong -ffunction-sections -fdata-sections -flto +cxxflags = -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -O3 $ + -DNDEBUG -fstack-protector-strong -ffunction-sections -fdata-sections -flto +third_party_cxxflags = -D_FORTIFY_SOURCE=2 -O3 -DNDEBUG $ + -fstack-protector-strong -ffunction-sections -fdata-sections -flto ldflags = -flto -Wl,-O2 -Wl,-z,relro -Wl,--gc-sections -Wl,--as-needed -- cgit v1.2.3