Treat C++ flags more like C flags, and only if C++ compiler specified

[openssl.git] / Configurations / 10-main.conf

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e773563dabee870a35c391e75f3e7fbb966e89b2..735b2a3d72d6d8a7dca4d0bbbd7f21827e297a50 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -148,6 +148,7 @@ my %targets = (
 
 #### Basic configs that should work on any 32-bit box
     "gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
         cflags           => picker(debug   => "-O0 -g",
                                    release => "-O3"),
@@ -155,6 +156,7 @@ my %targets = (
         bn_ops           => "BN_LLONG",
     },
     "cc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-O",
         thread_scheme    => "(unknown)",
@@ -630,6 +632,10 @@ my %targets = (
                                            debug   => "-O0 -g",
                                            release => "-O3"),
                                     threads("-pthread")),
+        cxxflags         => combine(picker(default => "-std=c++11 -Wall",
+                                           debug   => "-O0 -g",
+                                           release => "-O3"),
+                                    threads("-pthread")),
         cppflags         => "-DOPENSSL_USE_NODELETE",
         ex_libs          => add("-ldl", threads("-pthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
@@ -1431,7 +1437,7 @@ my %targets = (
                                      : " /MC"; }),
                    debug   => "/Od",
                    release => "/O1i"),
-        cppflags         => sub { vc_wince_info()->{defines}; },
+        cppflags         => sub { vc_wince_info()->{cppflags}; },
         defines          =>
             picker(default => [ "UNICODE", "_UNICODE", "OPENSSL_SYS_WINCE",
                                 "WIN32_LEAN_AND_MEAN", "L_ENDIAN", "DSO_WIN32",