Fix github CI (#470)

Summary: Pull Request resolved: facebookincubator/Glean#470

Reviewed By: malanka

Differential Revision: D62227838

fbshipit-source-id: 01802dd992322466e433a05cbb63c3169a22e014

common/util/fb-util.cabal

@@ -60,7 +60,9 @@ common fb-haskell
      ghc-options: -O2
 
 common fb-cpp
-  cxx-options: -std=c++17 -fcoroutines
+  cxx-options: -std=c++17
+  if !flag(clang)
+     cxx-options: -fcoroutines
   if arch(x86_64)
      cxx-options: -march=haswell
   if flag(opt)
@@ -69,6 +71,9 @@ common fb-cpp
 flag opt
      default: False
 
+flag clang
+     default: False
+
 library
     import: fb-haskell, fb-cpp
 

cpp-channel/thrift-cpp-channel.cabal

@@ -66,7 +66,9 @@ common fb-haskell
      ghc-options: -O2
 
 common fb-cpp
-  cxx-options: -std=c++17 -fcoroutines
+  cxx-options: -std=c++17
+  if !flag(clang)
+     cxx-options: -fcoroutines
   if arch(x86_64)
      cxx-options: -march=haswell
   if flag(opt)
@@ -75,6 +77,9 @@ common fb-cpp
 flag opt
      default: False
 
+flag clang
+     default: False
+
 library
     import: fb-haskell, fb-cpp
     exposed-modules:

server/thrift-server.cabal

@@ -61,7 +61,9 @@ common fb-haskell
      ghc-options: -O2
 
 common fb-cpp
-  cxx-options: -std=c++17 -fcoroutines
+  cxx-options: -std=c++17
+  if !flag(clang)
+     cxx-options: -fcoroutines
   -- very important to use -fcoroutines here, because there are
   -- #ifdefs in the fbthrift code (e.g. ThriftServer.h) that must
   -- be consistent with the fbthrift build.
@@ -73,6 +75,9 @@ common fb-cpp
 flag opt
      default: False
 
+flag clang
+     default: False
+
 library
   import: fb-haskell, fb-cpp
   exposed-modules:

tests/thrift-tests.cabal

@@ -61,9 +61,14 @@ common fb-haskell
 
 common fb-cpp
   cxx-options: -std=c++17
+  if !flag(clang)
+     cxx-options: -fcoroutines
   if arch(x86_64)
      cxx-options: -march=haswell
 
+flag clang
+     default: False
+
 common test-common
   hs-source-dirs: ., gen-hs2/
   build-depends: aeson,