Pass the -isysroot parameter to the linker too.

Bug: 1386212
Change-Id: I66c4314c2deea3799e92741475e9f7fc4129428a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4200986
Reviewed-by: Collin Baker <[email protected]>
Commit-Queue: danakj <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1098061}
NOKEYCHECK=True
GitOrigin-RevId: 1d6394b5d5463cc7351ee6c1e612507395db38e2

Author: danakj

build_rust.py

@@ -265,33 +265,32 @@ def RunXPy(sub, args, llvm_bins_path, zlib_path, libxml2_dirs, build_mac_arm,
         RUSTENV['CFLAGS'] += f' -isysroot {sdk_path}'
         RUSTENV['CXXFLAGS'] += f' -isysroot {sdk_path}'
         RUSTENV['LDFLAGS'] += f' -isysroot {sdk_path}'
-        RUSTENV['RUSTFLAGS_BOOTSTRAP'] += (f' -Clink-arg=-isysroot {sdk_path}')
+        RUSTENV['RUSTFLAGS_BOOTSTRAP'] += (
+            f' -Clink-arg=-isysroot -Clink-arg={sdk_path}')
         RUSTENV['RUSTFLAGS_NOT_BOOTSTRAP'] += (
-            f' -Clink-arg=-isysroot {sdk_path}')
+            f' -Clink-arg=-isysroot -Clink-arg={sdk_path}')
 
     if zlib_path:
         RUSTENV['CFLAGS'] += f' -I{zlib_path}'
         RUSTENV['CXXFLAGS'] += f' -I{zlib_path}'
         RUSTENV['LDFLAGS'] += f' {LD_PATH_FLAG}{zlib_path}'
-        RUSTENV['RUSTFLAGS_BOOTSTRAP'] += (f' -Clink-arg='
-                                           f'{LD_PATH_FLAG}{zlib_path}')
-        RUSTENV['RUSTFLAGS_NOT_BOOTSTRAP'] += (f' -Clink-arg='
-                                               f'{LD_PATH_FLAG}{zlib_path}')
+        RUSTENV['RUSTFLAGS_BOOTSTRAP'] += (
+            f' -Clink-arg={LD_PATH_FLAG}{zlib_path}')
+        RUSTENV['RUSTFLAGS_NOT_BOOTSTRAP'] += (
+            f' -Clink-arg={LD_PATH_FLAG}{zlib_path}')
 
     if libxml2_dirs:
         RUSTENV['CFLAGS'] += f' -I{libxml2_dirs.include_dir}'
         RUSTENV['CXXFLAGS'] += f' -I{libxml2_dirs.include_dir}'
         RUSTENV['LDFLAGS'] += f' {LD_PATH_FLAG}{libxml2_dirs.lib_dir}'
         RUSTENV['RUSTFLAGS_BOOTSTRAP'] += (
-            f' -Clink-arg='
-            f'{LD_PATH_FLAG}{libxml2_dirs.lib_dir}')
+            f' -Clink-arg={LD_PATH_FLAG}{libxml2_dirs.lib_dir}')
         RUSTENV['RUSTFLAGS_NOT_BOOTSTRAP'] += (
-            f' -Clink-arg='
-            f'{LD_PATH_FLAG}{libxml2_dirs.lib_dir}')
+            f' -Clink-arg={LD_PATH_FLAG}{libxml2_dirs.lib_dir}')
 
     if gcc_toolchain_path:
         # We use these flags to avoid linking with the system libstdc++.
-        gcc_toolchain_flag = (f'--gcc-toolchain={gcc_toolchain_path}')
+        gcc_toolchain_flag = f'--gcc-toolchain={gcc_toolchain_path}'
         RUSTENV['CFLAGS'] += f' {gcc_toolchain_flag}'
         RUSTENV['CXXFLAGS'] += f' {gcc_toolchain_flag}'
         RUSTENV['LDFLAGS'] += f' {gcc_toolchain_flag}'