Build: Fix non-x86 CFLAGS.

pyproject.toml

@@ -12,7 +12,7 @@ archs = ["x86_64", "aarch64", "i686", "ppc64le", "s390x"]
 repair-wheel-command = "auditwheel repair --strip -w {dest_dir} {wheel}"
 
 [tool.cibuildwheel.linux.environment]
-CFLAGS = "-O3 -g1 -pipe -fPIC -flto -march=sandybridge"
+CFLAGS = "-O3 -g1 -pipe -fPIC -flto -mtune=generic"
 AR = "gcc-ar"
 NM = "gcc-nm"
 RANLIB = "gcc-ranlib"
@@ -21,9 +21,20 @@ STATIC_DEPS = "true"
 LIBXML2_VERSION = "2.12.6"
 LIBXSLT_VERSION = "1.1.39"
 
+[[tool.cibuildwheel.overrides]]
+select = "*linux_i686"
+inherit.environment = "append"
+environment.CFLAGS="-O3 -g1 -pipe -fPIC -flto -march=sandybridge"
+
+[[tool.cibuildwheel.overrides]]
+select = "*linux_x86_64"
+inherit.environment = "append"
+environment.CFLAGS="-O3 -g1 -pipe -fPIC -flto -march=sandybridge"
+
 [[tool.cibuildwheel.overrides]]
 select = "*aarch64"
-environment = {CFLAGS = "-O3 -g1 -pipe -fPIC -flto -march=armv8-a -mtune=cortex-a72", AR = "gcc-ar", NM = "gcc-nm", RANLIB = "gcc-ranlib", LDFLAGS = "-flto", STATIC_DEPS = "true", LIBXML2_VERSION = "2.12.6", LIBXSLT_VERSION = "1.1.39" }
+inherit.environment = "append"
+environment.CFLAGS = "-O3 -g1 -pipe -fPIC -flto -march=armv8-a -mtune=cortex-a72"
 
 [tool.cibuildwheel.windows]
 archs = ["AMD64", "x86"]