Attachment #408646 for bug #557100

Lines 66-73 Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple, Link Here

(-)a/lib/Driver/Driver.cpp (-2 / +1 lines)
66	if (ClangResourceDir != "") {	66	if (ClangResourceDir != "") {
67	llvm::sys::path::append(P, ClangResourceDir);	67	llvm::sys::path::append(P, ClangResourceDir);
68	} else {	68	} else {
69	StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX);	69	llvm::sys::path::append(P, "..", "lib", "clang",
70	llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang",
71	CLANG_VERSION_STRING);	70	CLANG_VERSION_STRING);
72	}	71	}
73	ResourceDir = P.str();	72	ResourceDir = P.str();

Lines 1089-1096 std::string CompilerInvocation::GetResourcesPath(const char *Argv0, Link Here

(-)a/lib/Frontend/CompilerInvocation.cpp (-2 / +2 lines)
1089	if (ClangResourceDir != "")	1089	if (ClangResourceDir != "")
1090	llvm::sys::path::append(P, ClangResourceDir);	1090	llvm::sys::path::append(P, ClangResourceDir);
1091	else	1091	else
1092	llvm::sys::path::append(P, "..", Twine("lib") + CLANG_LIBDIR_SUFFIX,	1092	llvm::sys::path::append(P, "..", "lib", "clang",
1093	"clang", CLANG_VERSION_STRING);	1093	CLANG_VERSION_STRING);
1094		1094
1095	return P.str();	1095	return P.str();
1096	}	1096	}

Lines 93-96 set_target_properties(clang-headers PROPERTIES FOLDER "Misc") Link Here

(-)a/lib/Headers/CMakeLists.txt (-2 / +1 lines)
93	install(	93	install(
94	FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h	94	FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h
95	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ	95	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
96	DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)	96	DESTINATION lib/clang/${CLANG_VERSION}/include)
97	-

Return to bug 557100