mk: mbedcrypto should be optional

yoursunny · Jan 29, 2022 · 9d15566 · 9d15566
1 parent b3222c2
commit 9d15566
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
           fi
       - name: build and test with LLVM
         run: |
-          LDFLAGS='-fuse-ld=lld-11 -L/usr/local/lib' meson build.llvm --native-file mk/native-llvm.txt --buildtype debugoptimized -Db_ndebug=true -Dwerror=true -Dunittest=enabled -Dprograms=enabled
+          LDFLAGS='-fuse-ld=lld-11 -L/usr/local/lib' meson build.llvm --native-file mk/native-llvm.ini --buildtype debugoptimized -Db_ndebug=true -Dwerror=true -Dunittest=enabled -Dprograms=enabled
           cd build.llvm
           if ! ninja test; then
             cat meson-logs/testlog.txt && false

diff --git a/mk/native-llvm.txt → mk/native-llvm.ini b/mk/native-llvm.txt → mk/native-llvm.ini
diff --git a/src/meson.build b/src/meson.build
@@ -11,7 +11,7 @@ endif
 
 conf.set('NDNPH_PORT_FS_LINUX', '')
 
-mbedcrypto = cpp.find_library('mbedcrypto', has_headers: ['mbedtls/ecdh.h'])
+mbedcrypto = cpp.find_library('mbedcrypto', has_headers: ['mbedtls/ecdh.h'], required: false)
 if mbedcrypto.found()
   conf.set('NDNPH_HAVE_MBED', '')
 endif