Page MenuHomeFreeBSD
Differential D19732

Standardize -std=c++* as CXXSTD
ClosedPublic
Actions

Authored by ngie on Mar 28 2019, 12:41 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Nov 20, 2:15 AM
Unknown Object (File)
Sun, Nov 10, 9:20 PM
Unknown Object (File)
Sun, Nov 10, 9:05 PM
Unknown Object (File)
Sun, Nov 10, 8:25 PM
Unknown Object (File)
Thu, Nov 7, 2:46 PM
Unknown Object (File)
Tue, Nov 5, 12:20 PM
Unknown Object (File)
Tue, Nov 5, 10:04 AM
Unknown Object (File)
Fri, Nov 1, 11:55 AM
View All Files
Subscribers
asomers
dim
imp
portmgr

Details

Reviewers
bdrewery
emaste
jtl
sjg
asomers
Commits
rS345708: Standardize `-std=c++* as `CXXSTD`
rS345706: Standardize `-std=c++* as `CXXSTD`
rS345704: CXXSTD is the C++ analogue to CSTD.
Summary

CXXSTD is the C++ analogue to CSTD. It defaults to -std=c++11 with supporting
compilers; -std=gnu++98, otherwise for older versions of g++.

This change standardizes the CXXSTD variable, added to googletest.test.inc.mk
as part of r345203.

MFC after: 1 month

Test Plan

make buildworld

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Errors
SeverityLocationCodeMessage
Errorlib/libc++/Makefile:NAME1Bad Filename
Errorlib/libc++experimental/Makefile:NAME1Bad Filename
Errorlib/libc++fs/Makefile:NAME1Bad Filename
Unit
No Test Coverage
Build Status
Buildable 23338
Build 22367: arc lint + arc unit

Event Timeline

ngie created this revision.Mar 28 2019, 12:41 AM
Herald added a subscriber: imp. · View Herald TranscriptMar 28 2019, 12:41 AM
Harbormaster completed remote builds in B23337: Diff 55522.Mar 28 2019, 12:41 AM
ngie updated this revision to Diff 55523.Mar 28 2019, 12:45 AM

Diff reduce with ^/head

Harbormaster completed remote builds in B23338: Diff 55523.Mar 28 2019, 12:45 AM
asomers added inline comments.Mar 28 2019, 4:15 AM
share/mk/bsd.progs.mk
25

Why did you need to add CSTD and CXXSTD here?

share/mk/bsd.sys.mk
31

one too many C's in C++98.

ngie edited the summary of this revision. (Show Details)Mar 28 2019, 5:32 PM
ngie updated this revision to Diff 55545.Mar 28 2019, 5:33 PM

Fix typos introduced in bsd.sys.mk, noted by @asomers

Harbormaster completed remote builds in B23351: Diff 55545.Mar 28 2019, 5:33 PM
ngie added inline comments.Mar 28 2019, 5:35 PM
share/mk/bsd.progs.mk
25

So that way one can set the CSTD/CXXSTD on a per-program basis.

I will commit this separately, as it's orthogonal to this change.

ngie updated this revision to Diff 55546.Mar 28 2019, 5:35 PM

Remove bsd.progs.mk change from the review; this should be committed separately

Harbormaster completed remote builds in B23352: Diff 55546.Mar 28 2019, 5:35 PM
ngie marked an inline comment as done.Mar 28 2019, 5:41 PM
ngie added inline comments.
share/mk/bsd.progs.mk
25

Split out into D19738.

ngie added inline comments.Mar 28 2019, 5:43 PM
lib/libc/tests/stdlib/Makefile
53–54

Ah, I can't commit the bsd.progs.mk change separately. If I did, I would break these tests :/... I forgot that I did this.

ngie updated this revision to Diff 55548.Mar 28 2019, 5:45 PM

Remove Makefile from review that needs to be attached to D19738

Harbormaster completed remote builds in B23354: Diff 55548.Mar 28 2019, 5:45 PM
ngie updated this revision to Diff 55550.Mar 28 2019, 6:03 PM

Set CXXSTD explicitly when need be.

This unbreaks building lib/ofed/libibnetdisc/Makefile with pre-C++11 capable
compilers.

Harbormaster completed remote builds in B23356: Diff 55550.Mar 28 2019, 6:03 PM
asomers accepted this revision.Mar 28 2019, 9:46 PM
This revision is now accepted and ready to land.Mar 28 2019, 9:46 PM
emaste added a comment.Mar 29 2019, 2:15 PM

Approved. Please test make tinderbox though.

ngie added a subscriber: portmgr.Mar 29 2019, 6:03 PM

Ugh. Double-checked and ports specifies this variable as part of the USES framework.

143 CSTD=   c89 c99 c11 gnu89 gnu99 gnu11
144 CXXSTD= c++98 c++0x c++11 c++14 c++17 gnu++98 gnu++11 gnu++14 gnu++17
145 
146 .for std in ${CSTD} ${CXXSTD}

It also mashes CSTD though with multiple values, so if the issue doesn't exist with CSTD, it won't exist with CXXSTD. I'll see about fixing this in the ports tree so it doesn't collide as part of a separate commit.

ngie added a comment.Mar 29 2019, 6:05 PM
In D19732#423318, @emaste wrote:

Approved. Please test make tinderbox though.

[ngie@universe13a /scratch/tmp/ngie/svn/base/head]$ cat ../build.sh
#!/bin/sh
rm _.*
env MAKEOBJDIRPREFIX=/scratch/tmp/$USER/obj \
  make -s -j8 __MAKE_CONF=/dev/null tinderbox $@
[ngie@universe13a /scratch/tmp/ngie/svn/base/head]$ ../build.sh -DMAKE_JUST_WORLDS
...
>> arm.arm buildworld completed on Fri Mar 29 06:52:07 UTC 2019
>> arm.armv6 buildworld completed on Fri Mar 29 07:00:22 UTC 2019
>> arm.armv7 buildworld completed on Fri Mar 29 07:26:30 UTC 2019
>> arm completed on Fri Mar 29 07:26:30 UTC 2019
>> arm64.aarch64 buildworld completed on Fri Mar 29 07:33:49 UTC 2019
>> arm64 completed on Fri Mar 29 07:33:49 UTC 2019
>> i386.i386 buildworld completed on Fri Mar 29 07:58:46 UTC 2019
>> i386 completed on Fri Mar 29 07:58:46 UTC 2019
>> amd64.amd64 buildworld completed on Fri Mar 29 08:00:06 UTC 2019
>> amd64 completed on Fri Mar 29 08:00:06 UTC 2019
--------------------------------------------------------------
>>> make universe completed on Fri Mar 29 08:00:06 UTC 2019
                      (started Fri Mar 29 00:02:50 UTC 2019)
--------------------------------------------------------------
This revision was landed with ongoing or failed builds.Mar 29 2019, 6:13 PM
Closed by commit rS345704: CXXSTD is the C++ analogue to CSTD. (authored by ngie). · Explain Why
This revision was automatically updated to reflect the committed changes.
ngie mentioned this in rS345707: Revert r345706: the third time will be the charm.Mar 29 2019, 6:44 PM

Revision Contents
Changeset List

PathSize
lib/
clang/
2 lines
libc++/
4 lines
libc++experimental/
4 lines
libc++fs/
4 lines
libc/
tests/
stdlib/
4 lines
libclang_rt/
2 lines
libcxxrt/
4 lines
libgcc_eh/
4 lines
libomp/
2 lines
ofed/
libibnetdisc/
4 lines
share/
mk/
4 lines
13 lines
4 lines
usr.bin/
dtc/
2 lines
usr.sbin/
pmc/
3 lines

Diff 55523

View Options

lib/clang/llvm.build.mk

Loading...
View Options

lib/libc++/Makefile

Loading...
View Options

lib/libc++experimental/Makefile

Loading...
View Options

lib/libc++fs/Makefile

Loading...
View Options

lib/libc/tests/stdlib/Makefile

Loading...
View Options

lib/libclang_rt/Makefile.inc

Loading...
View Options

lib/libcxxrt/Makefile

Loading...
View Options

lib/libgcc_eh/Makefile.inc

Loading...
View Options

lib/libomp/Makefile

Loading...
View Options

lib/ofed/libibnetdisc/Makefile

Loading...
View Options

share/mk/bsd.progs.mk

Loading...
View Options

share/mk/bsd.sys.mk

Loading...
View Options

share/mk/googletest.test.inc.mk

Loading...
View Options

usr.bin/dtc/Makefile

Loading...
View Options

usr.sbin/pmc/Makefile

Loading...