Reverted this and the commit this was a follow up to (r189689) in revision r189700.
This was because since the original commit broke the OS X phase 1 build for ~2 hours. See my response to commit r189689 for details. Michael On Aug 30, 2013, at 12:45 PM, Edwin Vane <[email protected]> wrote: > Author: revane > Date: Fri Aug 30 14:45:49 2013 > New Revision: 189691 > > URL: http://llvm.org/viewvc/llvm-project?rev=189691&view=rev > Log: > cpp11-migrate: Fixing autoconf build after adding libclangReplace dependency > > > Modified: > clang-tools-extra/trunk/cpp11-migrate/Core/Makefile > clang-tools-extra/trunk/cpp11-migrate/tool/Makefile > clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile > > Modified: clang-tools-extra/trunk/cpp11-migrate/Core/Makefile > URL: > http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/cpp11-migrate/Core/Makefile?rev=189691&r1=189690&r2=189691&view=diff > ============================================================================== > --- clang-tools-extra/trunk/cpp11-migrate/Core/Makefile (original) > +++ clang-tools-extra/trunk/cpp11-migrate/Core/Makefile Fri Aug 30 14:45:49 > 2013 > @@ -11,4 +11,4 @@ LIBRARYNAME := migrateCore > > include $(CLANG_LEVEL)/Makefile > > -CPP.Flags += -I$(PROJ_SRC_DIR)/.. > +CPP.Flags += -I$(PROJ_SRC_DIR)/.. > -I$(PROJ_SRC_DIR)/../../clang-replace/include > > Modified: clang-tools-extra/trunk/cpp11-migrate/tool/Makefile > URL: > http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/cpp11-migrate/tool/Makefile?rev=189691&r1=189690&r2=189691&view=diff > ============================================================================== > --- clang-tools-extra/trunk/cpp11-migrate/tool/Makefile (original) > +++ clang-tools-extra/trunk/cpp11-migrate/tool/Makefile Fri Aug 30 14:45:49 > 2013 > @@ -36,14 +36,14 @@ SOURCES += $(addprefix ../ReplaceAutoPtr > BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir > > LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc > mcparser option > -USEDLIBS = migrateCore.a clangFormat.a clangTooling.a clangFrontend.a \ > +USEDLIBS = migrateCore.a clangFormat.a clangReplace.a clangTooling.a > clangFrontend.a \ > clangSerialization.a clangDriver.a clangRewriteFrontend.a \ > clangRewriteCore.a clangParse.a clangSema.a clangAnalysis.a \ > clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a > > include $(CLANG_LEVEL)/Makefile > > -CPP.Flags += -I$(PROJ_SRC_DIR)/.. > +CPP.Flags += -I$(PROJ_SRC_DIR)/.. > -I$(PROJ_SRC_DIR)/../../clang-replace/include > > # BUILT_SOURCES gets used as a prereq for many top-level targets. However, at > # the point those targets are defined, $(ObjDir) hasn't been defined and so > the > > Modified: clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile > URL: > http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile?rev=189691&r1=189690&r2=189691&view=diff > ============================================================================== > --- clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile (original) > +++ clang-tools-extra/trunk/unittests/cpp11-migrate/Makefile Fri Aug 30 > 14:45:49 2013 > @@ -13,7 +13,7 @@ include $(CLANG_LEVEL)/../../Makefile.co > TESTNAME = Cpp11MigrateTests > LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ > TransformUtils > -USEDLIBS = migrateCore.a clangFormat.a clangTooling.a clangFrontend.a \ > +USEDLIBS = migrateCore.a clangFormat.a clangReplace.a clangTooling.a > clangFrontend.a \ > clangSerialization.a clangDriver.a clangRewriteFrontend.a \ > clangRewriteCore.a clangParse.a clangSema.a clangAnalysis.a \ > clangAST.a clangASTMatchers.a clangEdit.a clangLex.a \ > @@ -21,5 +21,5 @@ USEDLIBS = migrateCore.a clangFormat.a c > > include $(CLANG_LEVEL)/Makefile > MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 > -CPP.Flags += -I$(PROJ_SRC_DIR)/../../cpp11-migrate > +CPP.Flags += -I$(PROJ_SRC_DIR)/../../cpp11-migrate > -I$(PROJ_SRC_DIR)/../../clang-replace/include > include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
