Commit 19eaee74 authored by Richard Levitte's avatar Richard Levitte
Browse files

VMS: Fix the passing of cflags for things not being installed 



When building object files for libraries, information whether the
library would be installed or not wasn't passed down to the object
file building rules.

Also, make it so settings like |no_inst_lib_cflags| can be the empty
string.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3247)
parent adcd8e37

Configurations/10-main.conf

+3 −3
Original line number Diff line number Diff line
@@ -1789,9 +1789,9 @@ sub vms_info { 
                                   debug   => "/DEBUG/TRACEBACK",

                                   release => "/NODEBUG/NOTRACEBACK"),

        lib_cflags       => add("/NAMES=(AS_IS,SHORTENED)/EXTERN_MODEL=STRICT_REFDEF"),

        # no_inst_bin_cflags is used instead of bin_cflags by descrip.mms.tmpl

        # for object files belonging to selected internal programs

        no_inst_bin_cflags => "/NAMES=(AS_IS,SHORTENED)",

        # no_inst_lib_cflags is used instead of lib_cflags by descrip.mms.tmpl

        # for object files belonging to selected internal libraries

        no_inst_lib_cflags => "",

        shared_target    => "vms-shared",

        dso_scheme       => "vms",

        thread_scheme    => "pthreads",

Configurations/common.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
                     objs => [ map { (my $x = $_) =~ s|\.o$||; $x }

                               @{$unified_info{sources}->{$lib}} ]);

     foreach (@{$unified_info{sources}->{$lib}}) {

         doobj($_, $lib, intent => "lib");

         doobj($_, $lib, intent => "lib", installed => is_installed($lib));

     }

     $cache{$lib} = 1;

 }

Configurations/descrip.mms.tmpl

+6 −6
Original line number Diff line number Diff line
@@ -157,12 +157,12 @@ CFLAGS_Q=$(CFLAGS) 
DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -})

LDFLAGS= {- $target{lflags} -}

EX_LIBS= {- $target{ex_libs} ? ",".$target{ex_libs} : "" -}{- $config{ex_libs} ? ",".$config{ex_libs} : "" -}

LIB_CFLAGS={- $target{lib_cflags} || "" -}

DSO_CFLAGS={- $target{dso_cflags} || "" -}

BIN_CFLAGS={- $target{bin_cflags} || "" -}

NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} || '$(LIB_CFLAGS)' -}

NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} || '$(DSO_CFLAGS)' -}

NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} || '$(BIN_CFLAGS)' -}

LIB_CFLAGS={- $target{lib_cflags} // "" -}

DSO_CFLAGS={- $target{dso_cflags} // "" -}

BIN_CFLAGS={- $target{bin_cflags} // "" -}

NO_INST_LIB_CFLAGS={- $target{no_inst_lib_cflags} // '$(LIB_CFLAGS)' -}

NO_INST_DSO_CFLAGS={- $target{no_inst_dso_cflags} // '$(DSO_CFLAGS)' -}

NO_INST_BIN_CFLAGS={- $target{no_inst_bin_cflags} // '$(BIN_CFLAGS)' -}



PERL={- $config{perl} -}