summaryrefslogtreecommitdiffstats
path: root/Configurations/10-main.conf
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-13 20:04:35 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-14 12:34:31 +0100
commitd8e2b4f9bf2e387ee533723a2d668fe7254b025c (patch)
tree737c2fbe51325a23d4ce4002dc8045187fbb84b7 /Configurations/10-main.conf
parentab90718953eabbd8fa519895387d065c94418f5c (diff)
Build files: parametrize cpp
Instead of having the knowledge of the exact flags to run the C preprocessor only and have it output on standard output in the deeper recesses of the build file template, make it a config parameter, or rely on build CPP in value ('$(CC) -E' on Unix). Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/5356)
Diffstat (limited to 'Configurations/10-main.conf')
-rw-r--r--Configurations/10-main.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 2c1491333a..f66e35bd52 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1308,6 +1308,7 @@ my %targets = (
inherit_from => [ "BASE_Windows" ],
template => 1,
cc => "cl",
+ cpp => '$(CC) /EP /C',
cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo",
defines => add("OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN",
"L_ENDIAN", "_CRT_SECURE_NO_DEPRECATE",
@@ -1848,6 +1849,7 @@ my %targets = (
inherit_from => [ "BASE_VMS" ],
template => 1,
cc => "CC/DECC",
+ cpp => '$(CC)/PREPROCESS_ONLY=SYS$OUTPUT:',
cflags =>
combine(picker(default => "/STANDARD=(ISOC94,RELAXED)/NOLIST/PREFIX=ALL",
debug => "/NOOPTIMIZE/DEBUG",