Merge pull request #3831 from rolfbjarne/watchos-fix-defaultproxy-test

[mono.git] / mono / metadata / Makefile.am

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index c662c8c76f8ee4d9a4a14dc115279e5e7c77e5d4..a3c116e51348fa00ecc3c6ca8df69197f11a1a1a 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -50,6 +50,7 @@ if PLATFORM_ANDROID
 platform_sources += ../../support/libm/complex.c
 endif
 
+if !DYNAMIC_BTLS
 if BTLS
 btls_file_list := $(shell cat ../btls/build-shared/mono-btls-shared-lo.txt)
 btls_static_file_list := $(shell cat ../btls/build-static/mono-btls-static-lo.txt)
@@ -57,6 +58,7 @@ btls_libs = $(btls_file_list)
 btls_static_libs = $(btls_static_file_list)
 btls_cflags = -I$(top_srcdir)/external/boringssl/include -I$(top_srcdir)/mono/btls
 endif
+endif
 
 #
 # libtool is not capable of creating static/shared versions of the same
@@ -108,7 +110,7 @@ mono-config-dirs.lo: Makefile
 libmonoruntime_config_la_SOURCES = \
        mono-config-dirs.h              \
        mono-config-dirs.c
-libmonoruntime_config_la_CPPFLAGS = $(AM_CPPFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+libmonoruntime_config_la_CPPFLAGS = $(AM_CPPFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"../$(reloc_libdir)\"
 
 CLEANFILES = mono-bundle.stamp
 
@@ -277,10 +279,6 @@ boehm_sources = \
        boehm-gc.c
 
 sgen_sources = \
-       sgen-os-posix.c         \
-       sgen-os-mach.c          \
-       sgen-os-win32.c         \
-       sgen-os-coop.c          \
        sgen-bridge.c           \
        sgen-bridge.h           \
        sgen-bridge-internals.h \