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: e03f5f9c60c4
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3accce043fd0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 22, 2021

  1. Copy the full SHA
    db028a8 View commit details
  2. Merge pull request #2993 from pleroy/Ketchup

    Fix link errors related to absl on macOS
    eggrobin authored May 22, 2021
    Copy the full SHA
    3accce0 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 Makefile
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ 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 \
$(DEP_DIR)abseil-cpp/absl/strings/libabsl_strings.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 \
@@ -112,6 +112,7 @@ ifeq ($(UNAME_S),Darwin)
-I$(DEP_DIR)compatibility/optional \
-I$(DEP_DIR)Optional \
-include "base/macos_allocator_replacement.hpp"
LIBS += -framework CoreFoundation
SHARED_ARGS += -mmacosx-version-min=10.12 -arch x86_64 -D_LIBCPP_STD_VER=16
SHAREDFLAG := -dynamiclib
endif