Skip to content

Commit 9a268ee

Browse files
committed
fix: dev: run manual cmake commands from build dir on macos
* remove the linker optimization arg for gnu on macos Signed-off-by: Stephen L Arnold <[email protected]>
1 parent a6f8bfc commit 9a268ee

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

tox.ini

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ skipsdist = true
66
[base]
77
setenv =
88
{abc,demo,soname,tests}: CFLAGS={env:CFLAGS:-march=native -O2 -g -DNDEBUG}
9-
{abc,demo,soname,tests}: CXXFLAGS={env:CFLAGS:-march=native -O2 -g -DNDEBUG}
10-
{abc,demo,soname,tests}: LDFLAGS={env:CFLAGS:-march=native -O2 -g -DNDEBUG -Wl,-O1 -Wl,--as-needed}
9+
{abc,demo,soname,tests}: CXXFLAGS={env:CXXFLAGS:-march=native -O2 -g -DNDEBUG}
10+
{abc,demo,soname,tests}: LDFLAGS={env:LDFLAGS:-march=native -O2 -g -DNDEBUG}
1111
{base,build,clang,ctest}: ABC_USE_NAMESPACE={env:ABC_USE_NAMESPACE:xxxx}
1212
{base,build,clang,ctest}: ABC_USE_SONAME={env:ABC_USE_SONAME:ON}
1313
{base,build,clang,ctest}: ABC_USE_PIC={env:ABC_USE_PIC:ON}
@@ -51,7 +51,7 @@ allowlist_externals =
5151
{abc,demo,soname,tests,clean}: make
5252

5353
changedir =
54-
{build,clang}: build
54+
{base,build,clang}: {toxinidir}/build
5555

5656
deps =
5757
{abc,demo,soname,tests,lint,base,build,clang,ctest,grind,ctestwin}: pip>=21.3
@@ -60,10 +60,10 @@ deps =
6060
{base,build,clang,ctest,grind,ctestwin}: ninja
6161
lint: cpplint
6262
grind: ValgrindCI
63-
lcov: lcov_cobertura
63+
clang: lcov_cobertura
6464

6565
commands_pre =
66-
{build,clang}: cmake -E make_directory {toxinidir}/build
66+
{base,build,clang}: cmake -E make_directory {toxinidir}/build
6767

6868
commands =
6969
abc: make -j4 ABC_USE_PIC=1 {posargs} abc
@@ -76,16 +76,15 @@ commands =
7676
demo: bash -c '$CXX -o demo demo.o libabc.a -lm -ldl -lreadline -lpthread'
7777
demo: bash -c './demo i10.aig'
7878
{abc,soname,tests}: bash -c 'ls -lh *abc* demo || true'
79-
base: bash -c 'cmake -G {posargs:"Ninja"} -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DCMAKE_INSTALL_PREFIX=$PREFIX -S . -B build'
80-
base: cmake -j $(nproc) --build build --target install
79+
base: bash -c 'cmake -G {posargs:"Ninja"} -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DCMAKE_INSTALL_PREFIX=$PREFIX ..'
80+
base: bash -c 'cmake --build . --target install -j $(nproc)'
8181
build: bash -c 'cmake -G {posargs:"Unix Makefiles"} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DABC_ENABLE_LTO=ON -DBUILD_SHARED_LIBS=ON -DABC_USE_SONAME=$ABC_USE_SONAME -DCMAKE_INSTALL_PREFIX=$PREFIX ..'
8282
clang: bash -c 'cmake -G {posargs:"Unix Makefiles"} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DCOVERAGE_BUILD=ON -DBUILD_SHARED_LIBS=OFF ..'
8383
{build}: bash -c 'cmake --build . -j $(nproc)'
8484
{clang}: bash -c 'cmake --build . --target coverage -j $(nproc)'
85-
{build}: bash -c 'ctest -V -C $BUILD_TYPE --test-dir ./'
86-
{clang}: bash -c 'ctest -V -C $BUILD_TYPE --test-dir ./'
87-
lcov: lcov_cobertura build/coverage/lcov.info --base-dir {toxinidir}/src --output coverage.xml
88-
build: cmake --build . --target install
85+
{build,clang}: bash -c 'ctest -V -C $BUILD_TYPE --test-dir ./'
86+
clang: lcov_cobertura build/coverage/lcov.info --base-dir {toxinidir}/src --output coverage.xml
87+
{base,build}: cmake --build . --target install
8988
{base,build}: bash -c 'find $PREFIX/ -type f -name \*abc\* -o -name demo | xargs ls -lh'
9089
ctest: bash -c 'ctest -j $(nproc) --build-generator {posargs:"Ninja"} --build-and-test . build --build-options -DABC_USE_NAMESPACE=$ABC_USE_NAMESPACE -DABC_SKIP_EXE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE --test-command ctest --rerun-failed --output-on-failure -V'
9190
ctestwin: ctest --build-generator {posargs:"Visual Studio 16 2019"} --build-and-test . build --build-options -DBUILD_SHARED_LIBS=ON -DABC_USE_NO_PTHREADS=ON -DABC_USE_NO_READLINE=ON -DCMAKE_BUILD_TYPE={env:BUILD_TYPE} --test-command ctest --rerun-failed --output-on-failure -V

0 commit comments

Comments
 (0)