aboutsummaryrefslogtreecommitdiff
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-07 14:50:37 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-07 18:25:56 +0100
commit8a67946e5bf1cd0fe0020e0f28cbf84642ec4132 (patch)
treea2f373de456e3ad20abbe6ce7d426c4e0a76e3f2 /Configurations
parent66ddf178b4eaac6d65f8ba56821f69b598556cec (diff)
downloadopenssl-8a67946e5bf1cd0fe0020e0f28cbf84642ec4132.zip
openssl-8a67946e5bf1cd0fe0020e0f28cbf84642ec4132.tar.gz
openssl-8a67946e5bf1cd0fe0020e0f28cbf84642ec4132.tar.bz2
Unified - Add the build.info command OVERRIDE, to avoid build file clashes
Should it be needed because the recipes within a RAW section might clash with those generated by Configure, it's possible to tell it not to generate them with the use of OVERRIDES, for example: SOURCE[libfoo]=foo.c bar.c OVERRIDES=bar.o BEGINRAW[Makefile(unix)] bar.o: bar.c $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $< ENDRAW[Makefile(unix)] Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/README12
-rw-r--r--Configurations/common.tmpl3
2 files changed, 15 insertions, 0 deletions
diff --git a/Configurations/README b/Configurations/README
index 40875a3..5665d24 100644
--- a/Configurations/README
+++ b/Configurations/README
@@ -404,6 +404,18 @@ configuration items:
build hoho.h: echo "/* hoho */" > hoho.h
ENDRAW[build.ninja(unix)]
+Should it be needed because the recipes within a RAW section might
+clash with those generated by Configure, it's possible to tell it
+not to generate them with the use of OVERRIDES, for example:
+
+ SOURCE[libfoo]=foo.c bar.c
+
+ OVERRIDES=bar.o
+ BEGINRAW[Makefile(unix)]
+ bar.o: bar.c
+ $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $<
+ ENDRAW[Makefile(unix)]
+
See the documentation further up for more information on configuration
items.
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl
index b97abfb..c2362d0 100644
--- a/Configurations/common.tmpl
+++ b/Configurations/common.tmpl
@@ -134,6 +134,9 @@
$cache{$script} = 1;
}
+ # Start with populating the cache with all the overrides
+ %cache = map { $_ => 1 } @{$unified_info{overrides}};
+
# Build all known libraries, engines, programs and scripts.
# Everything else will be handled as a consequence.
map { dolib($_) } @{$unified_info{libraries}};