Fit in 80 cols

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index c74c46c56c5ed2b8aeb7374baf35e4e1b7df7c70..b8006a2a1f748f474cf06d28fe8c2161f827e77e 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -226,7 +226,7 @@ else
 
     # Darwin requires -fstrict-aliasing to be explicitly enabled.
     ifeq ($(OS),Darwin)
-      EXTRA_OPTIONS += -fstrict-aliasing
+      EXTRA_OPTIONS += -fstrict-aliasing -Wstrict-aliasing
     endif
 
     CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
@@ -451,9 +451,8 @@ ifdef UNIVERSAL
   DISABLE_AUTO_DEPENDENCIES=1
 endif
 
-# Solaris requires the following flags to compile
 ifeq ($(OS),SunOS)
-CXX.Flags += -D_POSIX_C_SOURCE=199506L -U_XOPEN_SOURCE 
+CPP.BaseFlags += -include llvm/System/Solaris.h
 endif
 
 LD.Flags      += -L$(LibDir) -L$(LLVMLibDir)