From a7869c0bd65faacdd008284df9ab07de7df3d445 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 21 Nov 2021 11:13:28 +0100 Subject: Bundle flags in struct for easier passing around. --- test/suite/ctor_files/ctor.cc.bar | 24 ++++++++++++++---------- test/suite/ctor_files/ctor.cc.base | 24 ++++++++++++++---------- test/suite/ctor_files/ctor.cc.multi | 24 ++++++++++++++---------- 3 files changed, 42 insertions(+), 30 deletions(-) (limited to 'test/suite/ctor_files') diff --git a/test/suite/ctor_files/ctor.cc.bar b/test/suite/ctor_files/ctor.cc.bar index 2c9df2a..92456cb 100644 --- a/test/suite/ctor_files/ctor.cc.bar +++ b/test/suite/ctor_files/ctor.cc.bar @@ -16,12 +16,14 @@ BuildConfigurations ctorConfigs() .sources = { "hello.cc", }, - .cxxflags = { - "-std=c++20", - "-O3", - "-g", - "-Wall", - "-Werror", + .flags = { + .cxxflags = { + "-std=c++20", + "-O3", + "-g", + "-Wall", + "-Werror", + }, }, .externals = {"bar"}, } @@ -34,10 +36,12 @@ ExternalConfigurations ctorExtConfigs() { { .name = "bar", - .cxxflags = { "-D_A_", "-DBAR"}, - .cflags = { "-D_B_" }, - .ldflags = { "-D_C_" }, - .asmflags = { "-D_D_" }, + .flags = { + .cxxflags = { "-D_A_", "-DBAR"}, + .cflags = { "-D_B_" }, + .ldflags = { "-D_C_" }, + .asmflags = { "-D_D_" }, + }, // Creates --with-foo-prefix arg to configure which will be used for // -L and -I flags. // If not specified configure will try to find them in the system paths. diff --git a/test/suite/ctor_files/ctor.cc.base b/test/suite/ctor_files/ctor.cc.base index d9b8e4d..6c60513 100644 --- a/test/suite/ctor_files/ctor.cc.base +++ b/test/suite/ctor_files/ctor.cc.base @@ -16,12 +16,14 @@ BuildConfigurations ctorConfigs() .sources = { "hello.cc", }, - .cxxflags = { - "-std=c++20", - "-O3", - "-g", - "-Wall", - "-Werror", + .flags = { + .cxxflags = { + "-std=c++20", + "-O3", + "-g", + "-Wall", + "-Werror", + }, }, .externals = {"bar"}, } @@ -34,10 +36,12 @@ ExternalConfigurations ctorExtConfigs() { { .name = "bar", - .cxxflags = { "-D_A_", "-DFOO"}, - .cflags = { "-D_B_" }, - .ldflags = { "-D_C_" }, - .asmflags = { "-D_D_" }, + .flags = { + .cxxflags = { "-D_A_", "-DFOO"}, + .cflags = { "-D_B_" }, + .ldflags = { "-D_C_" }, + .asmflags = { "-D_D_" }, + }, // Creates --with-foo-prefix arg to configure which will be used for // -L and -I flags. // If not specified configure will try to find them in the system paths. diff --git a/test/suite/ctor_files/ctor.cc.multi b/test/suite/ctor_files/ctor.cc.multi index d518337..9db2517 100644 --- a/test/suite/ctor_files/ctor.cc.multi +++ b/test/suite/ctor_files/ctor.cc.multi @@ -18,12 +18,14 @@ BuildConfigurations ctorConfigs() .sources = { "hello.cc", }, - .cxxflags = { - "-std=c++20", - "-O3", - "-g", - "-Wall", - "-Werror", + .flags = { + .cxxflags = { + "-std=c++20", + "-O3", + "-g", + "-Wall", + "-Werror", + }, }, .externals = {"bar"}, } @@ -36,10 +38,12 @@ ExternalConfigurations ctorExtConfigs() { { .name = "bar", - .cxxflags = { "-D_A_", "-DFOO"}, - .cflags = { "-D_B_" }, - .ldflags = { "-D_C_" }, - .asmflags = { "-D_D_" }, + .flags = { + .cxxflags = { "-D_A_", "-DFOO"}, + .cflags = { "-D_B_" }, + .ldflags = { "-D_C_" }, + .asmflags = { "-D_D_" }, + }, // Creates --with-foo-prefix arg to configure which will be used for // -L and -I flags. // If not specified configure will try to find them in the system paths. -- cgit v1.2.3