Skip to content

Commit a36dcda

Browse files
committed
CDRIVER-1574 Remove --enable-hardening
1 parent b855c82 commit a36dcda

File tree

7 files changed

+4
-63
lines changed

7 files changed

+4
-63
lines changed

.evergreen/compile-unix.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ RELEASE_FLAGS="\
5959
--enable-html-docs=no \
6060
--enable-extra-align=no \
6161
--enable-optimizations \
62-
--enable-hardening \
6362
--disable-automatic-init-and-cleanup \
6463
--with-libbson=bundled \
6564
"

build/autotools/AutoHarden.m4

Lines changed: 0 additions & 57 deletions
This file was deleted.

build/autotools/Optimizations.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
OPTIMIZE_CFLAGS=""
22
OPTIMIZE_LDFLAGS=""
33

4+
AC_DEFUN([check_link_flag],
5+
[AX_CHECK_LINK_FLAG([$1], [$2], [$3], [-Werror $4])])
6+
47
dnl Check if we should use -Bsymbolic
58
AS_IF([test "$enable_optimizations" != "no"], [
69
check_link_flag([-Wl,-Bsymbolic], [OPTIMIZE_LDFLAGS="$OPTIMIZE_LDFLAGS -Wl,-Bsymbolic"])

build/autotools/PrintBuildConfiguration.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Build configuration:
3434
Enable debugging (slow) : ${enable_debug}
3535
Compile with debug symbols (slow) : ${enable_debug_symbols}
3636
Enable GCC build optimization : ${enable_optimizations}
37-
Enable automatic binary hardening : ${enable_hardening}
3837
Enable automatic init and cleanup : ${enable_automatic_init_and_cleanup}${automatic_init_deprecated}
3938
Code coverage support : ${enable_coverage}
4039
Cross Compiling : ${enable_crosscompile}

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ m4_include([build/autotools/ReadCommandLineArguments.m4])
3939
m4_include([build/autotools/CheckSasl.m4])
4040
m4_include([build/autotools/CheckSSL.m4])
4141
m4_include([build/autotools/FindDependencies.m4])
42-
m4_include([build/autotools/AutoHarden.m4])
4342
m4_include([build/autotools/MaintainerFlags.m4])
4443
m4_include([build/autotools/PlatformFlags.m4])
4544
m4_include([build/autotools/Optimizations.m4])

doc/mongoc_installing.page.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ Build configuration:
100100
Enable debugging (slow) : no
101101
Compile with debug symbols (slow) : no
102102
Enable GCC build optimization : yes
103-
Enable automatic binary hardening : yes
104103
Code coverage support : no
105104
Cross Compiling : no
106105
Fast counters : no

src/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ MONGOC_CPPFLAGS_SHARED = \
2323
$(PTHREAD_CFLAGS) \
2424
$(SSL_CFLAGS) \
2525
$(SASL_CFLAGS) \
26-
$(HARDEN_CFLAGS) \
2726
-fvisibility=hidden
2827

2928
if OS_SOLARIS
@@ -33,7 +32,7 @@ libmongoc_priv_la_CPPFLAGS = $(MONGOC_CPPFLAGS_SHARED)
3332
libmongoc_1_0_la_CPPFLAGS = $(MONGOC_CPPFLAGS_SHARED)
3433

3534

36-
MONGOC_LDFLAGS_SHARED = $(OPTIMIZE_LDFLAGS) $(COVERAGE_LDFLAGS) $(HARDEN_LDFLAGS)
35+
MONGOC_LDFLAGS_SHARED = $(OPTIMIZE_LDFLAGS) $(COVERAGE_LDFLAGS)
3736
libmongoc_priv_la_LDFLAGS = \
3837
$(MONGOC_LDFLAGS_SHARED) \
3938
-no-undefined

0 commit comments

Comments
 (0)