Fix build flags for Apple builds #1517
Merged
Conversation
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
erimatnor
requested review from
cevian,
pmwkaa,
mkindahl,
k-rus,
niksajakovljevic and
svenklemm
niksajakovljevic
approved these changes
Nov 4, 2019
svenklemm
approved these changes
Nov 4, 2019
A previous change made `UNIX` and `APPLE` build flags mutually exclusive instead of complementary. This broke builds on, e.g., Mac OS X. The changes in this commit will make builds work on Mac OS X again.
erimatnor
force-pushed
the
enordstr/fix-macosx-build-flags
branch
from
98a3603
to
b572103
Compare
Codecov Report
@@ Coverage Diff @@
## master #1517 +/- ##
==========================================
+ Coverage 91.46% 91.81% +0.34%
==========================================
Files 144 142 -2
Lines 21442 20511 -931
==========================================
- Hits 19612 18832 -780
+ Misses 1830 1679 -151
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A previous PR made
UNIXandAPPLEbuild flags mutually exclusiveinstead of complementary. This broke builds on, e.g., Mac OS X. This
change will revert this change to make builds work on Mac OS X again.