diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-26 13:05:29 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:15 -0500 |
commit | 78696ddcb237012ad1468440362ca67baab125f6 (patch) | |
tree | b9846b37b2529c7683b7343b181e9907f7c14812 /source4/build/smb_build/main.pl | |
parent | 0511b5df160c1276b59db8f57a27e289800d1915 (diff) | |
download | samba-78696ddcb237012ad1468440362ca67baab125f6.tar.gz samba-78696ddcb237012ad1468440362ca67baab125f6.tar.bz2 samba-78696ddcb237012ad1468440362ca67baab125f6.zip |
r11299: Try to fix build on Stratos VOS (doesn't support ld -r)
(This used to be commit 65c71bf354612a589049753d854e154482957573)
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r-- | source4/build/smb_build/main.pl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 0e8f81d759..3643c2d89a 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -20,6 +20,22 @@ use strict; my $INPUT = {}; my $mkfile = smb_build::config_mk::run_config_mk($INPUT, "main.mk"); + +if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) { + $smb_build::input::subsystem_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}; +} elsif ($config::config{BLDMERGED} eq "true") { + $smb_build::input::subsystem_output_type = "MERGEDOBJ"; +} + +if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) { + $smb_build::input::subsystem_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; +} elsif ($config::config{BLDSHARED} eq "true") { + # FIXME: This should really be SHARED_LIBRARY + $smb_build::input::subsystem_output_type = "MERGEDOBJ"; +} elsif ($config::config{BLDMERGED} eq "true") { + $smb_build::input::subsystem_output_type = "MERGEDOBJ"; +} + my $DEPEND = smb_build::input::check($INPUT, \%config::enabled); my $OUTPUT = output::create_output($DEPEND); my $mkenv = new smb_build::makefile(\%config::config, $OUTPUT, $mkfile); |