diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-04-28 18:18:04 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-04-29 15:20:48 +0200 |
| commit | e590afdcf41c63255d6393a3299c71fdb4813d66 (patch) | |
| tree | 9f0e940b82bee2d06d320f9d76270d5dc5cba444 /Configurations | |
| parent | 1bfe73d500f6127e61fcf2ffcf9b60c41cd6484e (diff) | |
VMS: only explicitely translate names in library C files.
When compiling all other C files, rely on the compiler to
automatically pick up the name translation information from the header
files __DECC_INCLUDE_{PRO,EPI}LOGUE.H.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 4 | ||||
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index ad80c70b88..9d3f3ffd4e 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1799,12 +1799,14 @@ sub vms_info { inherit_from => [ "BASE_VMS" ], template => 1, cc => "CC/DECC", - cflags => picker(default => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL/NAMES=(AS_IS,SHORTENED)", + cflags => picker(default => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL", debug => "/NOOPTIMIZE/DEBUG", release => "/OPTIMIZE/NODEBUG"), lflags => picker(default => "/MAP", debug => "/DEBUG/TRACEBACK", release => "/NODEBUG/NOTRACEBACK"), + lib_cflags => add("/NAMES=(AS_IS,SHORTENED)"), + dso_cflags => add("/NAMES=(AS_IS,SHORTENED)"), shared_target => "vms-shared", dso_scheme => "vms", thread_scheme => "pthreads", diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 416f0ed52e..df2c9e160f 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -137,6 +137,9 @@ 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} || "" -} PERL={- $config{perl} -} @@ -472,6 +475,9 @@ EOF my $srcs = join(", ", map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}}); + my $ecflags = { lib => '$(LIB_CFLAGS)', + dso => '$(DSO_CFLAGS)', + bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; my $incs_on = "\@ !"; my $incs_off = "\@ !"; my $incs = ""; @@ -502,7 +508,7 @@ $obj.OBJ : $deps ${before} SET DEFAULT $forward $incs_on - \$(CC) \$(CFLAGS)${incs}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs + \$(CC) \$(CFLAGS)${ecflags}${incs}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs $incs_off SET DEFAULT $backward ${after} |