diff options
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 4 | ||||
| -rw-r--r-- | source4/build/smb_build/input.pm | 4 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 1d38bf74f0..17bec56ced 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -35,7 +35,7 @@ my $section_types = { "PUBLIC_HEADERS" => "list", "EXTRA_CFLAGS" => "string", - "DEFAULT_VISIBILITY" => "string" + "STANDARD_VISIBILITY" => "string" }, "MODULE" => { "SUBSYSTEM" => "string", @@ -94,7 +94,7 @@ my $section_types = { "PRIVATE_PROTO_HEADER" => "string", "EXTRA_CFLAGS" => "string", - "DEFAULT_VISIBILITY" => "string" + "STANDARD_VISIBILITY" => "string" } }; diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 08fda140c1..5d6320942c 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -159,8 +159,8 @@ sub check($$$$$) $part->{NOPROTO} = "YES"; } - unless (defined($part->{DEFAULT_VISIBILITY})) { - $part->{DEFAULT_VISIBILITY} = "hidden"; + unless (defined($part->{STANDARD_VISIBILITY})) { + $part->{STANDARD_VISIBILITY} = "hidden"; } unless (defined($part->{EXTRA_CFLAGS})) { diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 59b4b05194..b0872db457 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -111,9 +111,9 @@ sub create_output($$) $part->{OUTPUT_TYPE} = "OBJLIST"; } - if (($part->{DEFAULT_VISIBILITY} ne "hidden") and + if (($part->{STANDARD_VISIBILITY} ne "hidden") and ($config->{visibility_attribute} eq "yes")) { - $part->{EXTRA_CFLAGS} .= " -fvisibility=$part->{DEFAULT_VISIBILITY}"; + $part->{EXTRA_CFLAGS} .= " -fvisibility=$part->{STANDARD_VISIBILITY}"; } generate_binary($part) if $part->{OUTPUT_TYPE} eq "BINARY"; |