Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 39ca26e3a25c
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f7d95493521
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 30, 2021

  1. Copy the full SHA
    7841e50 View commit details
  2. Merge pull request #3015 from pleroy/Linker

    Use a group for the absl libraries on Linux
    pleroy authored May 30, 2021
    Copy the full SHA
    2f7d954 View commit details
Showing with 11 additions and 8 deletions.
  1. +11 −8 Makefile
19 changes: 11 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -63,17 +63,20 @@ ifeq ($(UNAME_S),Darwin)
endif

TEST_LIBS := $(DEP_DIR)benchmark/src/libbenchmark.a $(DEP_DIR)protobuf/src/.libs/libprotobuf.a
LIBS := $(DEP_DIR)protobuf/src/.libs/libprotobuf.a \
$(DEP_DIR)gipfeli/libgipfeli.a \
-Wl,--start-group \
ABSL_LIBS := \
$(DEP_DIR)abseil-cpp/absl/base/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/debugging/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/numeric/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/status/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/strings/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/synchronization/libabsl_synchronization.a \
$(DEP_DIR)abseil-cpp/absl/time/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/debugging/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/numeric/libabsl_*.a \
$(DEP_DIR)abseil-cpp/absl/base/libabsl_*.a \
-Wl,--end-group \
$(DEP_DIR)abseil-cpp/absl/time/libabsl_*.a
ifeq ($(UNAME_S),Linux)
ABSL_LIBS = -Wl,--start-group $(ABSL_LIBS) -Wl,--end-group
endif
LIBS := $(DEP_DIR)protobuf/src/.libs/libprotobuf.a \
$(DEP_DIR)gipfeli/libgipfeli.a \
$(ABSL_LIBS) \
$(DEP_DIR)zfp/build/lib/libzfp.a \
$(DEP_DIR)glog/.libs/libglog.a -lpthread -lc++ -lc++abi
TEST_INCLUDES := \