From d6277e1e67b253c24c4f00053b506425d0128db2 Mon Sep 17 00:00:00 2001
From: Zuzana Baranova <xbaranov@fi.muni.cz>
Date: Thu, 27 Jun 2019 15:40:20 +0000
Subject: [PATCH] CC: Move the _cxx attribute from rt::NativeDiosCC into
Native.
---
divine/cc/native.hpp | 2 ++
divine/rt/dios-cc.hpp | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/divine/cc/native.hpp b/divine/cc/native.hpp
index 0073904e2..796d70049 100644
--- a/divine/cc/native.hpp
+++ b/divine/cc/native.hpp
@@ -95,11 +95,13 @@ namespace divine::cc
virtual std::unique_ptr< llvm::Module > link_bitcode();
void construct_paired_files();
void print_info( std::string_view version );
+ void set_cxx( bool cxx ) { _cxx = cxx; }
cc::ParsedOpts _po;
PairedFiles _files;
std::vector< std::string > _ld_args;
cc::CC1 _clang;
+ bool _cxx;
~Native();
};
diff --git a/divine/rt/dios-cc.hpp b/divine/rt/dios-cc.hpp
index 7d11957ad..fab318833 100644
--- a/divine/rt/dios-cc.hpp
+++ b/divine/rt/dios-cc.hpp
@@ -39,9 +39,6 @@ struct NativeDiosCC : cc::Native
auto link_dios_native( bool cxx );
std::unique_ptr< llvm::Module > link_bitcode() override;
void link() override;
- void set_cxx( bool cxx ) { _cxx = cxx; }
-
- bool _cxx;
};
} // rt
--
GitLab