Search arch specific lib directory

Author: zbowling

lib/script.py

@@ -35,7 +35,7 @@ def generate_products(self):
             variables += key + "=" + val
             variables += "\n"
         verbose_flags = """
-VERBOSE_FLAGS = """ 
+VERBOSE_FLAGS = """
         if Configuration.current.verbose:
             verbose_flags += "-v"
         verbose_flags += "\n"
@@ -80,7 +80,7 @@ def generate_products(self):
 BINUTILS_VERSION      = 4.8
 TARGET_LDSYSROOT      =
 """
-        
+
         if Configuration.current.bootstrap_directory is not None:
             base_flags += """
 BOOTSTRAP_DIR         = """ + Configuration.current.bootstrap_directory.relative() + """/common
@@ -101,7 +101,7 @@ def generate_products(self):
         if Configuration.current.bootstrap_directory is not None:
             c_flags += """  -I${BOOTSTRAP_DIR}/usr/include -I${BOOTSTRAP_DIR}/usr/local/include """
             c_flags += """  -I${TARGET_BOOTSTRAP_DIR}/usr/include -I${TARGET_BOOTSTRAP_DIR}/usr/local/include """
-        
+
         c_flags += Configuration.current.extra_c_flags
 
         swift_flags = "\nTARGET_SWIFTCFLAGS    = -I${SDKROOT}/lib/swift/" + Configuration.current.target.swift_sdk_name + " -Xcc -fblocks -resource-dir ${SDKROOT}/lib/swift "
@@ -120,9 +120,10 @@ def generate_products(self):
             swift_flags += "-O "
 
         swift_flags += Configuration.current.extra_swift_flags
-        
+
         swift_flags += """
-TARGET_SWIFTEXE_FLAGS = -I${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """  -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """
+TARGET_SWIFTEXE_FLAGS = -I${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """  -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + \
+""" -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """/""" +Configuration.current.target.swift_arch + """ """
         if Configuration.current.build_mode == Configuration.Debug:
             swift_flags += "-g -Onone -enable-testing "
         elif Configuration.current.build_mode == Configuration.Release:
@@ -135,7 +136,8 @@ def generate_products(self):
 EXTRA_LD_FLAGS       = """ + Configuration.current.extra_ld_flags
 
         ld_flags += """
-TARGET_LDFLAGS       = --target=${TARGET} ${EXTRA_LD_FLAGS} -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """ """
+TARGET_LDFLAGS       = --target=${TARGET} ${EXTRA_LD_FLAGS} -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + \
+""" -L${SDKROOT}/lib/swift/""" + Configuration.current.target.swift_sdk_name + """/""" +Configuration.current.target.swift_arch + """ """
         if Configuration.current.system_root is not None:
             ld_flags += "--sysroot=${SYSROOT}"
 
@@ -174,11 +176,11 @@ def generate_products(self):
 
         compilec_command = """
 rule CompileC
-    command = mkdir -p `dirname $out`; ${CLANG} ${TARGET_CFLAGS} $flags ${VERBOSE_FLAGS} -c $in -o $out 
+    command = mkdir -p `dirname $out`; ${CLANG} ${TARGET_CFLAGS} $flags ${VERBOSE_FLAGS} -c $in -o $out
     description = CompileC: $in
 
 rule CompileCxx
-    command = mkdir -p `dirname $out`; ${CLANGXX} ${TARGET_CFLAGS} ${TARGET_CXXFLAGS} $flags ${VERBOSE_FLAGS} -c $in -o $out 
+    command = mkdir -p `dirname $out`; ${CLANGXX} ${TARGET_CFLAGS} ${TARGET_CXXFLAGS} $flags ${VERBOSE_FLAGS} -c $in -o $out
     description = CompileCxx: $in
 """
 
@@ -195,13 +197,13 @@ def generate_products(self):
 
         assembler_command = """
 rule Assemble
-    command = mkdir -p `dirname $out`; ${CLANG} -x assembler-with-cpp -c $in -o $out ${TARGET_CFLAGS} $flags ${VERBOSE_FLAGS} 
+    command = mkdir -p `dirname $out`; ${CLANG} -x assembler-with-cpp -c $in -o $out ${TARGET_CFLAGS} $flags ${VERBOSE_FLAGS}
     description = Assemble: $in
 """
 
         link_command = """
 rule Link
-    command = mkdir -p `dirname $out`; ${CLANG} ${TARGET_LDFLAGS} ${VERBOSE_FLAGS} $start $in $end $flags -o $out""" 
+    command = mkdir -p `dirname $out`; ${CLANG} ${TARGET_LDFLAGS} ${VERBOSE_FLAGS} $start $in $end $flags -o $out"""
         if Configuration.current.verbose:
             link_command += "-Xlinker --verbose"
         link_command += """
@@ -211,7 +213,7 @@ def generate_products(self):
     command = mkdir -p `dirname $out`; ${AR} ${AR_FLAGS} $out $in
     description = Archive: $out
 """
-        
+
         swift_build_command = """
 rule SwiftExecutable
     command = mkdir -p `dirname $out`; ${SWIFTC} ${TARGET_SWIFTEXE_FLAGS} ${EXTRA_LD_FLAGS} $flags $in -o $out
@@ -267,5 +269,5 @@ def generate(self):
             for workspace in self.workspaces:
                 workspace.configure()
             script = self.generate_workspaces()
-            
-        
+
+