diff --git a/Makefile.rules b/Makefile.rules
index c9795ec6969..055baa08dc5 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -249,6 +249,11 @@ else
   C.Flags   += -D_DEBUG
 endif
 
+# IF REQUIRES_EH=1 is specified then don't disable exceptions
+ifndef REQUIRES_EH
+  CXX.Flags += -fno-exceptions
+endif
+
 CXX.Flags     += $(CXXFLAGS)
 C.Flags       += $(CFLAGS)
 CPP.BaseFlags += $(CPPFLAGS)
diff --git a/lib/AsmParser/Makefile b/lib/AsmParser/Makefile
index 9755571d07c..75ae34542a8 100644
--- a/lib/AsmParser/Makefile
+++ b/lib/AsmParser/Makefile
@@ -10,7 +10,6 @@
 LEVEL = ../..
 LIBRARYNAME := LLVMAsmParser
 BUILD_ARCHIVE = 1
-REQUIRES_EH := 1
 EXTRA_DIST := Lexer.cpp.cvs Lexer.l.cvs \
               llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs