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

Commits on Apr 10, 2020

  1. principia_make

    eggrobin committed Apr 10, 2020
    Copy the full SHA
    e021143 View commit details
  2. comments

    eggrobin committed Apr 10, 2020
    Copy the full SHA
    e484ecc View commit details
  3. remove empty override

    eggrobin committed Apr 10, 2020
    Copy the full SHA
    e79a1ba View commit details
  4. formatting

    eggrobin committed Apr 10, 2020
    Copy the full SHA
    6d117bc View commit details
  5. Merge pull request #2525 from eggrobin/principia_make

    principia_make
    eggrobin authored Apr 10, 2020
    Copy the full SHA
    5f6e758 View commit details
Showing with 25 additions and 0 deletions.
  1. +25 −0 principia_make.sh
25 changes: 25 additions & 0 deletions principia_make.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# It seems that protoc really wants its dependencies to be in /usr/local/lib.
# In some setups, e.g., Azure pipelines, this does not work, so we need to help
# it find its dynamic libraries.
if [ "${AGENT_OS?}" == "Darwin" ]; then
install_name_tool \
-change \
/usr/local/lib/libprotobuf.17.dylib \
./deps/protobuf/src/.libs/libprotobuf.17.dylib \
deps/protobuf/src/.libs/libprotoc.17.dylib
install_name_tool \
-change \
/usr/local/lib/libprotobuf.17.dylib \
./deps/protobuf/src/.libs/libprotobuf.17.dylib \
deps/protobuf/src/.libs/protoc
install_name_tool \
-change \
/usr/local/lib/libprotoc.17.dylib \
./deps/protobuf/src/.libs/libprotoc.17.dylib \
deps/protobuf/src/.libs/protoc
elif [ "${AGENT_OS?}" == "Linux" ]; then
export LD_LIBRARY_PATH="./deps/protobuf/src/.libs:$LD_LIBRARY_PATH"
fi

make test
make release