 +CXXFLAGS += -std=c++11 -Os
 +ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
 +
- else ifeq ($(CONFIG),emcc)
- CXX = emcc
- LD = emcc
-@@ -497,6 +511,11 @@ EXTRA_OBJS += $(1)
+ else ifneq ($(CONFIG),none)
+ $(error Invalid CONFIG setting '$(CONFIG)'. Valid values: clang, gcc, gcc-4.8, emcc, mxe, msys2, msys2-64)
+ endif
+@@ -551,6 +565,11 @@ EXTRA_OBJS += $(1)
  .SECONDARY: $(1)
  endef
  

+config-conda-mac: clean
+	echo 'CONFIG := conda-mac' > Makefile.conf
+
 config-gcc-4.8: clean
 	echo 'CONFIG := gcc-4.8' > Makefile.conf
 

diff --git a/Makefile b/Makefile
index cd617987..0e054e79 100644
--- a/Makefile
+++ b/Makefile
@@ -342,6 +342,20 @@ ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC
 ABCMKARGS += LIBS="-lpthread -s" ABC_USE_NO_READLINE=0 CC="x86_64-w64-mingw32-gcc" CXX="$(CXX)"
 EXE = .exe
 
+else ifeq ($(CONFIG),conda-linux)
+CXX = x86_64-conda_cos6-linux-gnu-gcc
