瀏覽代碼

Update FreeBSD build to use gcc-10

default_compile_flags
vector-of-bool 4 年之前
父節點
當前提交
77325d3064
共有 3 個檔案被更改,包括 6 行新增9 行删除
  1. +2
    -2
      Makefile
  2. +1
    -1
      Vagrantfile
  3. +3
    -6
      tools/freebsd-gcc-10.jsonc

+ 2
- 2
Makefile 查看文件

@@ -62,7 +62,7 @@ vagrant-freebsd-ci:
cd /vagrant && \
python3.7 tools/ci.py \
-B download \
-T tools/freebsd-gcc-9.jsonc \
-T tools/freebsd-gcc-10.jsonc \
'
vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64
vagrant halt
@@ -72,4 +72,4 @@ site: docs
mkdir -p _site/
cp site/index.html _site/
cp -r _build/docs _site/
echo "Site generated at _site/"
echo "Site generated at _site/"

+ 1
- 1
Vagrantfile 查看文件

@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
freebsd11.vm.box = 'generic/freebsd11'
freebsd11.vm.provision 'shell', inline: <<-SHELL
set -eu
for package in python37 py37-pip ccache gcc9 gcc8 git; do
for package in python37 py37-pip ccache gcc10 gcc9 gcc8 git; do
echo "Installing $package"
pkg install -qy $package
done

tools/freebsd-gcc-9.jsonc → tools/freebsd-gcc-10.jsonc 查看文件

@@ -1,15 +1,12 @@
{
"$schema": "../res/toolchain-schema.json",
"compiler_id": "gnu",
"c_compiler": "gcc9",
"cxx_compiler": "g++9",
"c_compiler": "gcc10",
"cxx_compiler": "g++10",
"cxx_version": "c++20",
"warning_flags": [
"-Werror",
],
"cxx_flags": [
"-fconcepts",
"-std=c++2a",
],
"link_flags": [
"-static-libgcc",
"-static-libstdc++"

Loading…
取消
儲存