[new-bootstrap] Fix linux build

Author: aciidgh

Sources/SPMLLBuild/CMakeLists.txt

@@ -19,7 +19,7 @@ else()
     set_target_properties(libllbuildSwift
         PROPERTIES
         FRAMEWORK TRUE
-        IMPORTED_LOCATION ${LLBUILD_BUILD_DIR}/lib/libllbuildSwift.dylib
+        IMPORTED_LOCATION ${LLBUILD_BUILD_DIR}/lib
         INTERFACE_INCLUDE_DIRECTORIES ${LLBUILD_BUILD_DIR}/products/llbuildSwift)
 endif()
 
@@ -34,7 +34,7 @@ target_link_libraries(SPMLLBuild PUBLIC
 if(LLBUILD_FRAMEWORK)
     target_link_libraries(SPMLLBuild PUBLIC -F libllbuildSwift)
 else()
-    target_link_libraries(SPMLLBuild PUBLIC libllbuild libllbuildSwift)
+	target_link_libraries(SPMLLBuild PUBLIC libllbuild -L libllbuildSwift)
 endif()
 
 # NOTE(compnerd) workaround for CMake not setting up include flags yet

Sources/swift-build/CMakeLists.txt

@@ -14,5 +14,4 @@ target_link_libraries(swift-build PRIVATE
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)
     install(TARGETS swift-build
         DESTINATION bin)
-else()
 endif()

Utilities/new-bootstrap

@@ -191,35 +191,36 @@ def bootstrap(args):
     args.bootstrap_path = os.path.join(args.target_path, "bootstrap")
     bootstrap_path = args.bootstrap_path
 
+
+    cmake_swift_flags = ""
+    if platform.system() == 'Darwin':
+        cmake_swift_flags = "-sdk " + g_default_sysroot
+
+    if args.llbuild_link_framework:
+        llbuild_arg = "-DLLBUILD_FRAMEWORK=%s" % args.llbuild_build_dir
+    else:
+        llbuild_dir = os.path.join(args.llbuild_build_dir, "cmake/modules")
+        llbuild_arg = "-DLLBuild_DIR=" + llbuild_dir
+
+    swiftpm_build_path = os.path.join(args.target_path, args.conf)
+
+    cmd = [
+        "cmake", "-G", "Ninja",
+        "-DCMAKE_BUILD_TYPE:=Debug",
+        "-DCMAKE_C_COMPILER:=clang",
+        llbuild_arg,
+        "-DCMAKE_Swift_FLAGS=" + cmake_swift_flags,
+        "-DUSE_VENDORED_TSC=ON",
+        "-DSWIFTPM_BUILD_DIR=" + swiftpm_build_path,
+        "-DCMAKE_INSTALL_PREFIX=" + args.install_prefixes[0],
+        g_project_root,
+    ]
+    print(' '.join(cmd))
+
     # Run CMake if needed.
     cmake_cache_path = os.path.join(bootstrap_path, "CMakeCache.txt")
     if not os.path.isfile(cmake_cache_path):
         mkdir_p(bootstrap_path)
-
-        cmake_swift_flags = ""
-        if platform.system() == 'Darwin':
-            cmake_swift_flags = "-sdk " + g_default_sysroot
-
-        if args.llbuild_link_framework:
-            llbuild_arg = "-DLLBUILD_FRAMEWORK=%s" % args.llbuild_build_dir
-        else:
-            llbuild_dir = os.path.join(args.llbuild_build_dir, "cmake/modules")
-            llbuild_arg = "-DLLBuild_DIR=" + llbuild_dir
-
-        swiftpm_build_path = os.path.join(args.target_path, args.conf)
-
-        cmd = [
-            "cmake", "-G", "Ninja",
-            "-DCMAKE_BUILD_TYPE:=Debug",
-            "-DCMAKE_C_COMPILER:=clang",
-            llbuild_arg,
-            "-DCMAKE_Swift_FLAGS=" + cmake_swift_flags,
-            "-DUSE_VENDORED_TSC=ON",
-            "-DSWIFTPM_BUILD_DIR=" + swiftpm_build_path,
-            "-DCMAKE_INSTALL_PREFIX=" + args.install_prefixes[0],
-            g_project_root,
-        ]
-        print(' '.join(cmd))
         subprocess.check_call(cmd, cwd=bootstrap_path)
 
     # Build.
@@ -244,6 +245,7 @@ def build_swiftpm(args):
         os.path.join(args.llbuild_build_dir, "lib"),
     ]
     env_cmd.append("DYLD_LIBRARY_PATH=%s" % (":".join(libs)))
+    env_cmd.append("LD_LIBRARY_PATH=%s" % (":".join(libs)))
 
     build_flags = []
     build_flags.append(os.path.join(args.bootstrap_path, "bin/swift-build"))
@@ -309,9 +311,15 @@ def main():
     args.build_path = os.path.abspath(args.build_path)
     args.swiftc_path = get_swiftc_path()
 
-    build_target = "x86_64-apple-macosx"
+    if platform.system() == 'Darwin':
+        build_target = "x86_64-apple-macosx"
+    else:
+        build_target = subprocess.check_output(
+            ["clang", "--print-target-triple"],
+            universal_newlines=True).strip()
+
     args.target_path = os.path.join(args.build_path, build_target)
-    args.conf = 'debug' if args.release else 'release'
+    args.conf = 'release' if args.release else 'debug'
 
     if "build-pd" in build_actions:
         build_runtimes_only(args)