diff options
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/input.pm | 6 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 2 | ||||
| -rw-r--r-- | source4/configure.in | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 0a215ef802..a6a19bc42b 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -137,7 +137,6 @@ if test -n "$VISIBILITY_CFLAGS"; then visibility_attribute=yes ],[ AC_MSG_RESULT(no) - VISIBILITY_CFLAGS="" ]) CFLAGS="$OLD_CFLAGS" fi diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 5d6320942c..8cad9aafa6 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -160,7 +160,11 @@ sub check($$$$$) } unless (defined($part->{STANDARD_VISIBILITY})) { - $part->{STANDARD_VISIBILITY} = "hidden"; + if ($part->{TYPE} eq "BINARY") { + $part->{STANDARD_VISIBILITY} = "hidden"; + } else { + $part->{STANDARD_VISIBILITY} = "default"; + } } unless (defined($part->{EXTRA_CFLAGS})) { diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index b0872db457..02e30ceeb5 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -111,7 +111,7 @@ sub create_output($$) $part->{OUTPUT_TYPE} = "OBJLIST"; } - if (($part->{STANDARD_VISIBILITY} ne "hidden") and + if (($part->{STANDARD_VISIBILITY} ne "default") and ($config->{visibility_attribute} eq "yes")) { $part->{EXTRA_CFLAGS} .= " -fvisibility=$part->{STANDARD_VISIBILITY}"; } diff --git a/source4/configure.in b/source4/configure.in index 625557fca5..caf0787179 100644 --- a/source4/configure.in +++ b/source4/configure.in @@ -52,7 +52,7 @@ AC_ARG_ENABLE(dso, ################################################# # add *_CFLAGS only for the real build -CFLAGS="${CFLAGS} ${VISIBILITY_CFLAGS} ${DEVELOPER_CFLAGS}" +CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}" ################################################# # final configure stuff |