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

Commits on May 30, 2021

  1. No recursivity.

    pleroy committed May 30, 2021
    Copy the full SHA
    21c102c View commit details
  2. Merge pull request #3016 from pleroy/Linker

    No recursivity in make
    pleroy authored May 30, 2021
    Copy the full SHA
    c45c8ae View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 Makefile
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -72,11 +72,13 @@ ABSL_LIBS := \
$(DEP_DIR)abseil-cpp/absl/synchronization/libabsl_synchronization.a \
$(DEP_DIR)abseil-cpp/absl/time/libabsl_*.a
ifeq ($(UNAME_S),Linux)
ABSL_LIBS = -Wl,--start-group $(ABSL_LIBS) -Wl,--end-group
ABSL_GROUP_LIBS = -Wl,--start-group $(ABSL_LIBS) -Wl,--end-group
else
ABSL_GROUP_LIBS = $(ABSL_LIBS)
endif
LIBS := $(DEP_DIR)protobuf/src/.libs/libprotobuf.a \
$(DEP_DIR)gipfeli/libgipfeli.a \
$(ABSL_LIBS) \
$(ABSL_GROUP_LIBS) \
$(DEP_DIR)zfp/build/lib/libzfp.a \
$(DEP_DIR)glog/.libs/libglog.a -lpthread -lc++ -lc++abi
TEST_INCLUDES := \