diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | mono/btls/Makefile.am | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9959c554e0d..e39a33a5453 100644 --- a/configure.ac +++ b/configure.ac @@ -2989,6 +2989,7 @@ case "$host" in AOT_SUPPORTED="yes" BTLS_SUPPORTED=yes BTLS_PLATFORM=i386 + AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no]) ;; darwin*) AOT_SUPPORTED="yes" @@ -3011,6 +3012,7 @@ case "$host" in AOT_SUPPORTED="yes" BTLS_SUPPORTED=yes BTLS_PLATFORM=x86_64 + AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no]) ;; darwin*) AOT_SUPPORTED="yes" diff --git a/mono/btls/Makefile.am b/mono/btls/Makefile.am index 6a5b1061320..9b61a23468e 100644 --- a/mono/btls/Makefile.am +++ b/mono/btls/Makefile.am @@ -50,16 +50,16 @@ all-local: $(BTLS_STATIC_LIST) $(BTLS_SHARED_LIST) if DYNAMIC_BTLS build-shared/Makefile: -mkdir -p build-shared - (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_DYNAMIC_BTLS=1 $(abs_top_srcdir)/mono/btls) + (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_DYNAMIC_BTLS=1 $(abs_top_srcdir)/mono/btls) else build-shared/Makefile: -mkdir -p build-shared - (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls) + (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls) endif build-static/Makefile: -mkdir -p build-static - (cd build-static && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls) + (cd build-static && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls) $(BTLS_STATIC_LIST): build-static/Makefile $(MAKE) -C build-static $(CMAKE_VERBOSE) |