Revert "Fix flang-aarch64-libcxx builder"

This reverts commit d7ab3d8.

Author: luporl

buildbot/osuosl/master/config/builders.py

@@ -2540,9 +2540,6 @@
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
                         "-DLLVM_ENABLE_LIBCXX=On",
                         "-DCMAKE_BUILD_TYPE=Release",
-                        "-DLLVM_RUNTIME_TARGETS=aarch64-unknown-linux-gnu",
-                        "-DRUNTIMES_aarch64-unknown-linux-gnu_CMAKE_CXX_COMPILER='c++'",
-                        "-DRUNTIMES_aarch64-unknown-linux-gnu_CMAKE_C_COMPILER='cc'"
                         ])},
 
     {'name' : "flang-aarch64-release",

zorg/buildbot/builders/FlangBuilder.py

@@ -138,22 +138,10 @@ def getFlangOutOfTreeBuildFactory(
         )
     )
 
-    # 'check-flang-rt' becomes 'check-flang-rt-<target>' when a runtime target
-    # is specified.
-    check_flang_rt = 'check-flang-rt'
-    for arg in llvm_extra_configure_args:
-        if arg.find("DLLVM_RUNTIME_TARGETS") != -1:
-            targets = arg.split('=', 1)[1]
-            # Currently only one target is supported.
-            if not targets or targets.find(";") != -1:
-                break
-            check_flang_rt += '-' + targets
-            break
-
     addNinjaSteps(
        f,
        obj_dir=flang_rt_obj_dir,
-       checks=[check_flang_rt],
+       checks=['check-flang-rt'],
        env=env,
        stage_name="flang-rt",
        **kwargs)