[flang-commits] [flang] dfa0f3e - Revert "[flang] Check there's no dependency on C++ libs"

[Diana Picus via flang-commits]

Author: Diana Picus
Date: 2021-06-16T11:09:08Z
New Revision: dfa0f3ee0ea1b72b81b469736e9271098e4129b3

URL: https://github.com/llvm/llvm-project/commit/dfa0f3ee0ea1b72b81b469736e9271098e4129b3
DIFF: https://github.com/llvm/llvm-project/commit/dfa0f3ee0ea1b72b81b469736e9271098e4129b3.diff

LOG: Revert "[flang] Check there's no dependency on C++ libs"

This reverts commit 7ddbf2633911a5c378ad6af01e250f6f252b9032.

This doesn't work if we're not building libFortranRuntime.a. I'll
recommit with a fix.

Added: 
    

Modified: 
    flang/test/lit.cfg.py
    flang/test/lit.site.cfg.py.in

Removed: 
    flang/test/Runtime/no-cpp-dep.c


################################################################################
diff  --git a/flang/test/Runtime/no-cpp-dep.c b/flang/test/Runtime/no-cpp-dep.c
deleted file mode 100644
index a35a52d91ac3..000000000000
--- a/flang/test/Runtime/no-cpp-dep.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This test makes sure that flang's runtime does not depend on the C++ runtime
-library. It tries to link this simple file against libFortranRuntime.a with
-a C compiler.
-
-REQUIRES: c-compiler
-
-RUN: %cc -std=c90 %s -I%runtimeincludes %libruntime -o /dev/null
-*/
-
-#include "entry-names.h"
-
-/*
-Manually add declarations for the runtime functions that we want to make sure
-we're testing. We can't include any headers directly since they likely contain
-C++ code that would explode here.
-*/
-double RTNAME(CpuTime)();
-
-int main() {
-  double x = RTNAME(CpuTime)();
-  return x;
-}

diff  --git a/flang/test/lit.cfg.py b/flang/test/lit.cfg.py
index cdbb7fc5bf4c..4109400087e5 100644
--- a/flang/test/lit.cfg.py
+++ b/flang/test/lit.cfg.py
@@ -75,19 +75,6 @@
    tools.append(ToolSubst('%flang_fc1', command=FindTool('f18'),
     unresolved='fatal'))
 
-# Define some variables to help us test that the flang runtime doesn't depend on
-# the C++ runtime libraries. For this we need a C compiler. If for some reason
-# we don't have one, we can just disable the test.
-if config.cc:
-    config.available_features.add('c-compiler')
-    tools.append(ToolSubst('%cc', command=config.cc, unresolved='ignore'))
-    tools.append(ToolSubst('%libruntime',
-        command=os.path.join(config.flang_lib_dir, 'libFortranRuntime.a'),
-        unresolved='warn'))
-    tools.append(ToolSubst('%runtimeincludes',
-        command=os.path.join(config.flang_src_dir, 'runtime'),
-        unresolved='warn'))
-
 if config.flang_standalone_build:
     llvm_config.add_tool_substitutions(tools, [config.flang_llvm_tools_dir])
 else:

diff  --git a/flang/test/lit.site.cfg.py.in b/flang/test/lit.site.cfg.py.in
index bcafd8ac4302..17822b0b7d2e 100644
--- a/flang/test/lit.site.cfg.py.in
+++ b/flang/test/lit.site.cfg.py.in
@@ -9,10 +9,8 @@ config.flang_src_dir = "@FLANG_SOURCE_DIR@"
 config.flang_tools_dir = "@FLANG_TOOLS_DIR@"
 config.flang_intrinsic_modules_dir = "@FLANG_INTRINSIC_MODULES_DIR@"
 config.flang_llvm_tools_dir = "@CMAKE_BINARY_DIR@/bin"
-config.flang_lib_dir = "@CMAKE_BINARY_DIR@/lib"
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.flang_standalone_build = @FLANG_STANDALONE_BUILD@
-config.cc = "@CMAKE_C_COMPILER@"
 
 # Control the regression test for flang-new driver
 import lit.util