Skip to content

Commit 4441688

Browse files
kleisaukelovell
authored andcommitted
Remove redundant _GLIBCXX_USE_CXX11_ABI define
1 parent c38f3a1 commit 4441688

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

build/posix.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,13 @@ mkdir ${DEPS}
3939
mkdir ${TARGET}
4040

4141
# Default optimisation level is for binary size (-Os)
42-
# Overriden to performance (-O3) for select dependencies that benefit
42+
# Overridden to performance (-O3) for select dependencies that benefit
4343
export FLAGS+=" -Os -fPIC"
4444

45-
# Force "new" C++11 ABI compliance
4645
# Remove async exception unwind/backtrace tables
4746
# Allow linker to remove unused sections
4847
if [ "$LINUX" = true ]; then
49-
export FLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=1 -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections"
48+
export FLAGS+=" -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections"
5049
fi
5150

5251
# Common build paths and flags
@@ -437,6 +436,8 @@ cd ${TARGET}/lib
437436
if [ "$LINUX" = true ]; then
438437
# Check that we really linked with -z nodelete
439438
readelf -Wd ${VIPS_CPP_DEP} | grep -qF NODELETE || (echo "$VIPS_CPP_DEP was not linked with -z nodelete" && exit 1)
439+
# Check that we really use the "new" C++11 ABI
440+
readelf -Ws ${VIPS_CPP_DEP} | c++filt | grep -qF "::__cxx11::" || (echo "$VIPS_CPP_DEP mistakenly uses the C++03 ABI" && exit 1)
440441
fi
441442
copydeps ${VIPS_CPP_DEP} ${TARGET}/lib-filtered
442443

0 commit comments

Comments
 (0)