Configure: if a file is generated, never assume it's in the source dir
authorRichard Levitte <levitte@openssl.org>
Tue, 13 Feb 2018 18:46:10 +0000 (19:46 +0100)
committerRichard Levitte <levitte@openssl.org>
Tue, 13 Feb 2018 20:12:26 +0000 (21:12 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5355)

(cherry picked from commit 9b7e82f8d939ca6894f941268b219da55f069b26)

Configure

index 90a4651da1cd2b04a8164c57de66298e96f2fcfd..bfd8b320c0b64507160975eb67d94bcb4e6e6ca8 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1757,7 +1757,7 @@ EOF
 
                 # If it isn't in the source tree, we assume it's generated
                 # in the build tree
-                if (! -f $s) {
+                if (! -f $s || $generate{$_}) {
                     $s = cleanfile($buildd, $_, $blddir);
                 }
                 # We recognise C and asm files
@@ -1783,7 +1783,7 @@ EOF
 
                 # If it isn't in the source tree, we assume it's generated
                 # in the build tree
-                if (! -f $s) {
+                if (! -f $s || $generate{$_}) {
                     $s = cleanfile($buildd, $_, $blddir);
                 }
                 # We recognise C and asm files