Merge branch 'MACOSINST-26' into Release_2.1

2 years ago · 62d5d17a41
parent 07f4532853 41ae98b8c1
commit 62d5d17a41
1 changed files with 0 additions and 4 deletions
--- a/server/Makefile
+++ b/server/Makefile
@ -35,10 +35,6 @@ ifeq ($(BUILD_ON),Darwin)
    ifeq ($(BUILD_FOR),Darwin)
        LDLIBS+= -liconv -lobjc -framework Foundation -framework Security
        LDLIBS+= -lboost_filesystem$(BOOST_MT) -lboost_program_options$(BOOST_MT) -lboost_system$(BOOST_MT) -lboost_thread$(BOOST_MT) -lboost_regex$(BOOST_MT)
-
-        # ASAN is not strictly a MacOS/clang feature, but won't work with musl.
-        CXXFLAGS+= -fsanitize=address
-        LDFLAGS+=  -fsanitize=address
    else
        $(error I do not know how to make for $(BUILD_FOR) on $(BUILD_ON))
    endif