-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update build rules and patches for darwin_arm64 platform.
Changes include: Update nelhage/rules_boost package from current version (08/5/2020) to 5/27/2021 version. Remove rules_boost-undefine-boost_fallthrough.patch, since BOOST_FALLTHROUGH seems to be defined now. Minor changes to rules_boost-windows-linkopts.patch to use default condition to add -lpthread flag for all platforms. Add darwin_arm64 config to BUILD files for lib civetweb pulled in via prometheu dependency.
- Loading branch information
Jun Gong
committed
Oct 1, 2021
1 parent
c052395
commit d521337
Showing
4 changed files
with
44 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 0 additions & 8 deletions
8
thirdparty/patches/rules_boost-undefine-boost_fallthrough.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,12 @@ | ||
diff --git BUILD.boost BUILD.boost | ||
--- BUILD.boost | ||
+++ BUILD.boost | ||
@@ -313,1 +313,9 @@ boost_library(name = "asio", | ||
- linkopts = ["-lpthread"], | ||
+ linkopts = select({ | ||
+ ":linux": [ | ||
+ "-lpthread", | ||
+ ], | ||
+ ":osx_x86_64": [ | ||
+ "-lpthread", | ||
+ ], | ||
+ "//conditions:default": [], | ||
+ }), | ||
-- | ||
@@ -428,6 +428,7 @@ boost_library( | ||
}), | ||
linkopts = select({ | ||
":android": [], | ||
+ ":windows": [], | ||
"//conditions:default": ["-lpthread"], | ||
}), | ||
deps = [ | ||
-- |