[interop] fixup the interop build test substitutions

Author: hyp

test/Interop/SwiftToCxx/functions/cdecl-execution.cpp

@@ -2,8 +2,8 @@
 
 // RUN: %target-swift-frontend %S/cdecl.swift -typecheck -module-name CdeclFunctions -emit-cxx-header-path %t/functions.h
 
-// RUN: %target-interop-clangxx -c %s -I %t -o %t/cdecl-execution.o
-// RUN: %target-build-swift-link-cxx %S/cdecl.swift -o %t/cdecl-execution -Xlinker %t/cdecl-execution.o -module-name Functions -Xfrontend -entry-point-function-name -Xfrontend swiftMain
+// RUN: %target-interop-build-clangxx -c %s -I %t -o %t/cdecl-execution.o
+// RUN: %target-interop-build-swift %S/cdecl.swift -o %t/cdecl-execution -Xlinker %t/cdecl-execution.o -module-name Functions -Xfrontend -entry-point-function-name -Xfrontend swiftMain
 
 // RUN: %target-codesign %t/cdecl-execution
 // RUN: %target-run %t/cdecl-execution

test/Interop/SwiftToCxx/functions/swift-functions-execution.cpp

@@ -2,8 +2,8 @@
 
 // RUN: %target-swift-frontend %S/swift-functions.swift -typecheck -module-name Functions -emit-cxx-header-path %t/functions.h
 
-// RUN: %target-interop-clangxx -c %s -I %t -o %t/swift-functions-execution.o
-// RUN: %target-build-swift-link-cxx %S/swift-functions.swift -o %t/swift-functions-execution -Xlinker %t/swift-functions-execution.o -module-name Functions -Xfrontend -entry-point-function-name -Xfrontend swiftMain
+// RUN: %target-interop-build-clangxx -c %s -I %t -o %t/swift-functions-execution.o
+// RUN: %target-interop-build-swift %S/swift-functions.swift -o %t/swift-functions-execution -Xlinker %t/swift-functions-execution.o -module-name Functions -Xfrontend -entry-point-function-name -Xfrontend swiftMain
 
 // RUN: %target-codesign %t/swift-functions-execution
 // RUN: %target-run %t/swift-functions-execution | %FileCheck %s

test/Interop/lit.local.cfg

@@ -17,6 +17,5 @@ else:
     # FIXME(compnerd) do all the targets we currently support use SysV ABI?
     config.substitutions.insert(0, ('%target-abi', 'SYSV'))
 
-config.substitutions.insert(0, ('%target-build-swift-link-cxx', '%target-build-swift -Xfrontend -enable-cxx-interop ' + libc_opt))
-
-config.substitutions.insert(0, ('%target-interop-clangxx', '%target-clangxx ' + clang_opt))
+config.substitutions.insert(0, ('%target-interop-build-swift', '%target-build-swift -Xfrontend -enable-cxx-interop ' + libc_opt))
+config.substitutions.insert(0, ('%target-interop-build-clangxx', '%target-clangxx ' + clang_opt))