diff options
| -rw-r--r-- | Configurations/10-main.conf | 6 | ||||
| -rw-r--r-- | Configurations/common.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 09c0f2d0eb..6a86b3509c 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -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", diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index 5fd6b9729c..5e9cb36bb2 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -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; } diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index b6eb94a580..5b4b10943d 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -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} -} |