Merge pull request #87 from benlangmuir/toolchain-path-cp

[5.3] [build-script][test] Remove hard-coded install prefix of /usr and pass it in instead

Author: shahmishal

Sources/ISDBTibs/TibsToolchain.swift

@@ -118,9 +118,9 @@ extension TibsToolchain {
 
     let fm = FileManager.default
 
-    let envVar = "INDEXSTOREDB_TOOLCHAIN_PATH"
+    let envVar = "INDEXSTOREDB_TOOLCHAIN_BIN_PATH"
     if let path = ProcessInfo.processInfo.environment[envVar] {
-      let bin = URL(fileURLWithPath: "\(path)/usr/bin", isDirectory: true)
+      let bin = URL(fileURLWithPath: "\(path)/bin", isDirectory: true)
       swiftc = bin.appendingPathComponent("swiftc", isDirectory: false)
       clang = bin.appendingPathComponent("clang", isDirectory: false)
 

Utilities/build-script-helper.py

@@ -33,10 +33,10 @@ def get_swiftpm_options(args):
     swiftpm_args += [
       # Dispatch headers
       '-Xcxx', '-I', '-Xcxx',
-      os.path.join(args.toolchain, 'usr', 'lib', 'swift'),
+      os.path.join(args.toolchain, 'lib', 'swift'),
       # For <Block.h>
       '-Xcxx', '-I', '-Xcxx',
-      os.path.join(args.toolchain, 'usr', 'lib', 'swift', 'Block'),
+      os.path.join(args.toolchain, 'lib', 'swift', 'Block'),
     ]
 
   return swiftpm_args
@@ -66,15 +66,15 @@ def add_common_args(parser):
   args.toolchain = os.path.abspath(args.toolchain)
 
   if args.toolchain:
-    swift_exec = os.path.join(args.toolchain, 'usr', 'bin', 'swift')
+    swift_exec = os.path.join(args.toolchain, 'bin', 'swift')
   else:
     swift_exec = 'swift'
 
   swiftpm_args = get_swiftpm_options(args)
 
   env = os.environ
   # Set the toolchain used in tests at runtime
-  env['INDEXSTOREDB_TOOLCHAIN_PATH'] = args.toolchain
+  env['INDEXSTOREDB_TOOLCHAIN_BIN_PATH'] = args.toolchain
 
   if args.ninja_bin:
     env['NINJA_BIN'] = args.ninja_bin