diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-03-23 23:57:36 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-03-23 23:57:36 +0300 |
| commit | 38acd5685b0ad798754f2c0357043e0dd199808d (patch) | |
| tree | 4eca8011850803172333dc62dadd3f697f59220b | |
| parent | ad329252468e010ac3432bf5cef7dc4a701dbcb3 (diff) | |
Minor fixes for Mac OS brew llvm
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | cmake/brew-llvm.sh | 6 | ||||
| -rw-r--r-- | include/llfio/revision.hpp | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c2899441..73de0cdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,7 +232,7 @@ int main() { if(CXX_IS_USING_LIBCXX) find_library(libcxx_cxxfs c++fs) find_library(libcxx_cxxexperimental c++experimental) - if(NOT libcxx_cxxfs MATCHES "NOTFOUND" AND NOT libcxx_cxxexperimental MATCHES "NOTFOUND") + if(libcxx_cxxfs MATCHES "NOTFOUND" AND libcxx_cxxexperimental MATCHES "NOTFOUND") # I guess default to forcing libc++experimental? set(libcxx_cxxexperimental -lc++experimental) endif() diff --git a/cmake/brew-llvm.sh b/cmake/brew-llvm.sh new file mode 100755 index 00000000..07843ff4 --- /dev/null +++ b/cmake/brew-llvm.sh @@ -0,0 +1,6 @@ +export PATH="/usr/local/opt/llvm/bin:$PATH" +export LDFLAGS="-L/usr/local/opt/llvm/lib" +export CPPFLAGS="-I/usr/local/opt/llvm/include" +export CXX=clang++ +export CC=clang + diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index 76170031..32b11a93 100644 --- a/include/llfio/revision.hpp +++ b/include/llfio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define LLFIO_PREVIOUS_COMMIT_REF e194dbe017c0f008eb1e717908bd965df69e6641 -#define LLFIO_PREVIOUS_COMMIT_DATE "2020-03-23 13:50:07 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE e194dbe0 +#define LLFIO_PREVIOUS_COMMIT_REF ad329252468e010ac3432bf5cef7dc4a701dbcb3 +#define LLFIO_PREVIOUS_COMMIT_DATE "2020-03-23 19:59:45 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE ad329252 |