File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -39,14 +39,13 @@ mkdir ${DEPS}
3939mkdir ${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
4343export 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
4847if [ " $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"
5049fi
5150
5251# Common build paths and flags
@@ -437,6 +436,8 @@ cd ${TARGET}/lib
437436if [ " $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)
440441fi
441442copydeps ${VIPS_CPP_DEP} ${TARGET} /lib-filtered
442443
You can’t perform that action at this time.
0 commit comments