From f16ecebbc4902851f0d3df33981f194dc33d2867 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 5 Jul 2019 19:24:04 -0700 Subject: No C++ components anymore --- .build.yml | 2 +- .travis.yml | 4 ++-- README.md | 8 ++++---- config.def.lua | 2 -- docker/config.lua | 4 ++-- gen.lua | 2 -- ninja.lua | 1 - toolchain/aarch64-linux-musl.ninja | 1 - toolchain/default.ninja | 1 - toolchain/x86_64-linux-musl.ninja | 1 - 10 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.build.yml b/.build.yml index 276fc3d8..10c456c4 100644 --- a/.build.yml +++ b/.build.yml @@ -31,7 +31,7 @@ tasks: return { builddir='out', fs={{sets[set], exclude={'^include/', '^lib/.*%.a$'}}}, - target={toolchain='x86_64-linux-musl', cflags='-O2 -pipe -fpie', cxxflags='\$target_cflags', ldflags='-s -static -pie', pie=true}, + target={toolchain='x86_64-linux-musl', cflags='-O2 -pipe -fpie', ldflags='-s -static -pie', pie=true}, host={toolchain='default', cflags='-pipe', ldflags=''}, repo={path='$HOME/root-x86_64.git', flags='--bare', tag='tree', branch=set}, } diff --git a/.travis.yml b/.travis.yml index 2cfdb2f8..f83e7d57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ script: echo 'return { builddir="out", fs={exclude={}}, - target={toolchain="x86_64-linux-musl", cflags="-O2 -pipe", cxxflags="$target_cflags", ldflags="-s -static", pie=true}, - host={toolchain="default", cflags="-pipe", cxxflags="$host_cflags", ldflags=""}, + target={toolchain="x86_64-linux-musl", cflags="-O2 -pipe", ldflags="-s -static", pie=true}, + host={toolchain="default", cflags="-pipe", ldflags=""}, repo={path="$builddir/root.git", flags="--bare", tag="tree", branch="master"}, tls="libressl", video_drivers={intel=true, nouveau=true} diff --git a/README.md b/README.md index 880b9921..eb46e743 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ a solution for many common tasks: * DNS server (nsd) * BitTorrent client (transmission) -The entire system can be compiled in minutes, and uses up up only a couple -hundred megabytes of disk space (despite being statically linked). It is almost -entirely C-based, and only one optional component requires C++ (libutp for -transmission). +The entire system can be compiled in minutes, and uses up up only +a couple hundred megabytes of disk space (despite being statically +linked). It is entirely C-based, and most packages make limited use +of GNU C extensions. Updating your system is as simple as diff --git a/config.def.lua b/config.def.lua index e29faae4..f4c7a2b7 100644 --- a/config.def.lua +++ b/config.def.lua @@ -16,7 +16,6 @@ return { target={ toolchain='x86_64-linux-musl', cflags='-O2 -pipe -fpie', - cxxflags='$target_cflags', ldflags='-s -static -pie', pie=true }, @@ -25,7 +24,6 @@ return { host={ toolchain='default', cflags='-pipe', - cxxflags='$host_cflags', ldflags='', }, diff --git a/docker/config.lua b/docker/config.lua index da6b59a6..de182243 100644 --- a/docker/config.lua +++ b/docker/config.lua @@ -7,8 +7,8 @@ return { exclude={'^include/', '^lib/.*%.a$'}, }, }, - target={toolchain='default', cflags='-O2 -pipe -U _FORTIFY_SOURCE', cxxflags='', ldflags='-s -static', pie=true}, - host={toolchain='default', cflags='-O2 -pipe', cxxflags='', ldflags='-s'}, + target={toolchain='default', cflags='-O2 -pipe -U _FORTIFY_SOURCE', ldflags='-s -static', pie=true}, + host={toolchain='default', cflags='-O2 -pipe', ldflags='-s'}, repo={path='$builddir/root.git', flags='--bare', tag='tree', branch='oasis'}, video_drivers={intel=true, nouveau=true}, } diff --git a/gen.lua b/gen.lua index 5153ce5f..e0590aec 100644 --- a/gen.lua +++ b/gen.lua @@ -5,12 +5,10 @@ set('outdir', '$builddir') set('target_toolchain', config.target.toolchain) set('target_cflags', config.target.cflags) -set('target_cxxflags', config.target.cxxflags) set('target_ldflags', config.target.ldflags) set('host_toolchain', config.host.toolchain) set('host_cflags', config.host.cflags) -set('host_cxxflags', config.host.cxxflags) set('host_ldflags', config.host.ldflags) set('repo', config.repo.path) diff --git a/ninja.lua b/ninja.lua index 7a452a70..2ea263b1 100644 --- a/ninja.lua +++ b/ninja.lua @@ -230,7 +230,6 @@ end function toolchain(name) set('cflags', '$'..name..'_cflags') - set('cxxflags', '$'..name..'_cxxflags') set('ldflags', '$'..name..'_ldflags') include('toolchain/$'..name..'_toolchain.ninja') end diff --git a/toolchain/aarch64-linux-musl.ninja b/toolchain/aarch64-linux-musl.ninja index cf16f1e0..05837734 100644 --- a/toolchain/aarch64-linux-musl.ninja +++ b/toolchain/aarch64-linux-musl.ninja @@ -1,7 +1,6 @@ ar = aarch64-linux-musl-ar as = aarch64-linux-musl-as cc = aarch64-linux-musl-cc -cxx = aarch64-linux-musl-c++ ld = aarch64-linux-musl-ld mc = false objcopy = aarch64-linux-musl-objcopy diff --git a/toolchain/default.ninja b/toolchain/default.ninja index e1d6f07c..de74ba8a 100644 --- a/toolchain/default.ninja +++ b/toolchain/default.ninja @@ -1,7 +1,6 @@ ar = ar as = as cc = cc -cxx = c++ ld = ld mc = 6m objcopy = objcopy diff --git a/toolchain/x86_64-linux-musl.ninja b/toolchain/x86_64-linux-musl.ninja index ce6e3f19..a1ebe9ef 100644 --- a/toolchain/x86_64-linux-musl.ninja +++ b/toolchain/x86_64-linux-musl.ninja @@ -1,7 +1,6 @@ ar = x86_64-linux-musl-ar as = x86_64-linux-musl-as cc = x86_64-linux-musl-cc -cxx = x86_64-linux-musl-c++ ld = x86_64-linux-musl-ld mc = 6m objcopy = x86_64-linux-musl-objcopy -- cgit v1.2.3