diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
index f5297ba5396681..65863d7508a8c3 100644
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -64,7 +64,7 @@ endif ()
 option(LIBCLANG_BUILD_STATIC
   "Build libclang as a static library (in addition to a shared one)" OFF)
 
-set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libclang.exports)
+set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_BINARY_DIR}/libclang-generic.exports)
 set(LIBCLANG_VERSION_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map)
 
 if(MSVC)
diff --git a/clang/tools/libclang/linker-script-to-export-list.py b/clang/tools/libclang/linker-script-to-export-list.py
index 4b57be03c6c705..37fb172b9a0a25 100644
--- a/clang/tools/libclang/linker-script-to-export-list.py
+++ b/clang/tools/libclang/linker-script-to-export-list.py
@@ -3,9 +3,9 @@
 import sys
 
 input_file = open(sys.argv[1])
-output_file = open(sys.argv[2])
+output_file = open(sys.argv[2], 'w')
 
 for line in input_file:
-    m = re.search('clang_[^;]+', line)
+    m = re.search('^\s+(clang_[^;]+)', line)
     if m:
-        output_file.write(m.group(0))
+        output_file.write(m.group(1) + "\n")