Incorporate the contents of include/llvm/Config/unistd.h as this is the

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 37cb1c5a94b45250fe2a1f6abf0ff357724197c0..dd0d5c74409f08dbf362962471731c734528c0d7 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -83,14 +83,20 @@ endif
 
 ifneq ($(BUILD_OBJ_ROOT),$(BUILD_SRC_ROOT))
 spotless:
-       $(Echo) Wiping out $(BUILD_OBJ_ROOT) and rebuilding configuration.
        $(Verb) if test -x config.status ; then \
-         $(MV) config.status .. ; \
-         $(MV) mklib  .. ; \
+         $(EchoCmd) Wiping out $(BUILD_OBJ_ROOT) ; \
+         $(MKDIR) .spotless.save ; \
+         $(MV) config.status .spotless.save ; \
+         $(MV) mklib  .spotless.save ; \
+         $(MV) projects  .spotless.save ; \
          $(RM) -rf * ; \
-         $(MV) ../config.status . ; \
-         $(MV) ../mklib . ; \
-         ./config.status ; \
+         $(MV) .spotless.save/config.status . ; \
+         $(MV) .spotless.save/mklib . ; \
+         $(MV) .spotless.save/projects . ; \
+         $(RM) -rf .spotless.save ; \
+         $(EchoCmd) Rebuilding configuration of $(BUILD_OBJ_ROOT) ; \
+         $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
+         $(ConfigStatusScript) ; \
        else \
          $(EchoCmd) "make spotless" can only be run from $(BUILD_OBJ_ROOT); \
        fi
@@ -753,7 +759,7 @@ endif
 
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
-  JIT_LIBS  += LLVMX86 LLVMSelectionDAG
+  JIT_LIBS  += LLVMX86
 endif
 
 # You can enable the SparcV9 JIT on a non-SparcV9 host by setting the flag