From 30fb77e4c6741026c122daef130d4bcb25b8bfeb Mon Sep 17 00:00:00 2001
From: Daniel Donenfeld <dadonenf@microsoft.com>
Date: Fri, 8 Feb 2019 00:31:22 +0000
Subject: [PATCH] Fix issues with clang and gcc builds

---
 tests/CMakeLists.txt        |  4 +++-
 tests/span_compile_only.cpp | 14 --------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e1968b2..0d40885 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -229,8 +229,10 @@ function(add_gsl_asm_test name)
     else()
         target_compile_options(${name}_asm_options INTERFACE
             -S
-            -o ${ASM_LOCATION}\\${name}.s
         )
+        set_target_properties(${name}_asm PROPERTIES PREFIX "")
+        set_target_properties(${name}_asm PROPERTIES OUTPUT_NAME "${ASM_LOCATION}/${name}")
+        set_target_properties(${name}_asm PROPERTIES SUFFIX  ".s")    
     endif(MSVC)
 
     target_link_libraries(${name}_asm
diff --git a/tests/span_compile_only.cpp b/tests/span_compile_only.cpp
index 54400b7..abc8de8 100644
--- a/tests/span_compile_only.cpp
+++ b/tests/span_compile_only.cpp
@@ -37,20 +37,6 @@ struct fail_fast;
 using namespace std;
 using namespace gsl;
 
-namespace
-{
-struct BaseClass
-{
-};
-struct DerivedClass : BaseClass
-{
-};
-struct AddressOverloaded
-{
-    AddressOverloaded operator&() const { return {}; }
-};
-}
-
 GSL_SUPPRESS(con.4) // NO-FORMAT: attribute
 bool foo()
 {