4 files changed, 15 insertions, 7 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 0af44768b..163e64272 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -30,9 +30,14 @@ darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
 </so_link_flags>
 
 <isa_flags>
+"sse2"   -> "-msse2"
+"ssse3"  -> "-mssse3"
+"sse4.1" -> "-msse4.1"
+"sse4.2" -> "-msse4.2"
+"avx"    -> "-mavx"
 "aes-ni" -> "-maes"
-"ssse3" -> "-mssse3"
-"sse2" -> "-msse2"
+"avx2"   -> "-mavx2"
+"bmi2"   -> "-mbmi2"
 </isa_flags>
 
 <mach_opt>
@@ -43,7 +48,8 @@ ivybridge   -> "-march=core-avx-i"
 </mach_opt>
 
 <mach_abi_linking>
-all     -> "-stdlib=libc++ -pthread"
+#all     -> "-stdlib=libc++ -pthread"
+all     -> "-stdlib=libstdc++ -pthread"
 
 x86_64  -> "-m64"
 ppc64   -> "-m64"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index b8b9b15b3..52d5020e2 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -44,6 +44,8 @@ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 "sse4.2" -> "-msse4.2"
 "avx"    -> "-mavx"
 "aes-ni" -> "-maes"
+"avx2"   -> "-mavx2"
+"bmi2"   -> "-mbmi2"
 </isa_flags>
 
 <mach_opt>
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index 0b6afe0c3..fbc45a681 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -6,8 +6,8 @@ LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 LINK_TO       = %{link_to}
 
-LIB_FLAGS     = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
-CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
+LIB_FLAGS     = $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
+CHECK_FLAGS   = $(LANG_FLAGS) $(CHECK_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index 806969a00..c412a94fd 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -8,8 +8,8 @@ SO_OBJ_FLAGS  = %{shared_flags}
 SO_LINK_CMD   = %{so_link}
 LINK_TO       = %{link_to}
 
-LIB_FLAGS     = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS)
-CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
+LIB_FLAGS     = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
+CHECK_FLAGS   = $(LANG_FLAGS) $(CHECK_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}