Fix unnecessary rebuilds on Ninja

Not tested on make but maybe happened there too
This commit is contained in:
Andrew Hyatt 2021-02-09 14:22:33 -05:00
parent 9289fe3bbc
commit 8440f6a072
10 changed files with 12 additions and 9 deletions

View File

@ -42,7 +42,7 @@
#include <syslog.h> #include <syslog.h>
/* for errKCDuplicateItem */ /* for errKCDuplicateItem */
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
#define CERT_DEBUG 0 #define CERT_DEBUG 0
#if CERT_DEBUG #if CERT_DEBUG

View File

@ -50,7 +50,7 @@
#include "secitem.h" #include "secitem.h"
#include <security_asn1/secerr.h> #include <security_asn1/secerr.h>
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
/* /*
* SecCmsContentInfoCreate - create a content info * SecCmsContentInfoCreate - create a content info

View File

@ -47,7 +47,7 @@
#include <security_asn1/secasn1.h> #include <security_asn1/secasn1.h>
#include <security_asn1/secerr.h> #include <security_asn1/secerr.h>
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
struct nss_cms_encoder_output { struct nss_cms_encoder_output {
SecCmsContentCallback outputfn; SecCmsContentCallback outputfn;

View File

@ -47,7 +47,7 @@
#include <Security/SecKeyPriv.h> #include <Security/SecKeyPriv.h>
#include <Security/SecItemPriv.h> #include <Security/SecItemPriv.h>
#include <Security/Security.h> #include <Security/Security.h>
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
#include <Security/SecCmsBase.h> #include <Security/SecCmsBase.h>
#include <Security/secasn1t.h> #include <Security/secasn1t.h>
#include <security_asn1/plarenas.h> #include <security_asn1/plarenas.h>

View File

@ -55,7 +55,7 @@
#include <utilities/SecCFWrappers.h> #include <utilities/SecCFWrappers.h>
#include <utilities/debugging.h> #include <utilities/debugging.h>
#include <AssertMacros.h> #include <AssertMacros.h>
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
#include <Security/SecPolicyPriv.h> #include <Security/SecPolicyPriv.h>
#include <Security/SecItem.h> #include <Security/SecItem.h>
#include <libDER/asn1Types.h> #include <libDER/asn1Types.h>

View File

@ -47,7 +47,7 @@
#include <security_asn1/secerr.h> #include <security_asn1/secerr.h>
#include <Security/cssmapi.h> #include <Security/cssmapi.h>
#include <Security/cssmapple.h> #include <Security/cssmapple.h>
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
/* /*

View File

@ -31,7 +31,7 @@
*/ */
#include <security_utilities/debugging.h> #include <security_utilities/debugging.h>
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
#include <Security/SecCmsDecoder.h> #include <Security/SecCmsDecoder.h>
#include <Security/SecCmsMessage.h> #include <Security/SecCmsMessage.h>

View File

@ -63,7 +63,7 @@
#include <Security/SecIdentity.h> #include <Security/SecIdentity.h>
#include <Security/SecIdentitySearch.h> #include <Security/SecIdentitySearch.h>
#include <CoreFoundation/CFString.h> #include <CoreFoundation/CFString.h>
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
#include <utilities/SecCFRelease.h> #include <utilities/SecCFRelease.h>
#include <stdio.h> #include <stdio.h>

View File

@ -45,7 +45,7 @@
#include "srCdsaUtils.h" #include "srCdsaUtils.h"
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> #include <CoreServices/MacErrors.h>
const char * const _masterKeychainName = "FileVaultMaster.keychain"; const char * const _masterKeychainName = "FileVaultMaster.keychain";
const char * const _masterKeychainPath = "./FileVaultMaster"; const char * const _masterKeychainPath = "./FileVaultMaster";

3
darling-patch-cmds.sh Normal file
View File

@ -0,0 +1,3 @@
find . -type f -not -wholename \*.git\* -exec sed -i 's/CoreServices\/\.\.\/Frameworks\/CarbonCore\.framework\/Headers/CoreServices/' {} \;