Merge branch 'fix-bundle-install_cpp_headers' of https://github.com/g…

…oxberry/oclint into fix-googletest
yulingtianxia · Jan 27, 2018 · e55814f · e55814f
2 parents ccddf3d + 27a8efd
commit e55814f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/oclint-scripts/bundle b/oclint-scripts/bundle
@@ -92,7 +92,7 @@ def install_xcodebuild():
 
 def install_cpp_headers():
     if environment.is_darwin():
-        install_dir = path.build.clang_install_dir
+        install_dir = (path.build.clang_install_dir if not args.llvm_root else args.llvm_root)
         clang_cpp_headers_dir = os.path.join(install_dir, 'include', 'c++')
         oclint_cpp_headers_dir = os.path.join(bundle_include_dir, 'c++')
         path.mkdir_p(bundle_include_dir)
@@ -141,4 +141,3 @@ if not args.docgen:
 
 if args.archive:
     archive(args.release)
-