33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
# HG changeset patch
|
|
# User Rob Lemley <rob@thunderbird.net>
|
|
# Date 1663091141 0
|
|
# Tue Sep 13 17:45:41 2022 +0000
|
|
# Node ID fbc2cf15893e40959b04d22c9efa4d424aeb5c4f
|
|
# Parent 121afb4ed9b0e282cf6690736ffadf1498578434
|
|
Bug 1790662 - Update librnp compiler include path for new location of json-c's json.h r=dandarnell
|
|
|
|
|
|
json.h from json-c is now a preprocessed file and is found in the object directory
|
|
rather than the source directory.
|
|
|
|
Depends on D157961
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D157962
|
|
|
|
diff --git a/comm/third_party/rnp/moz.build b/third_party/rnp/moz.b/commuild
|
|
--- a/comm/third_party/rnp/moz.build
|
|
+++ b/comm/third_party/rnp/moz.build
|
|
@@ -81,11 +81,11 @@ else:
|
|
|
|
if CONFIG["MZLA_SYSTEM_JSONC"]:
|
|
CXXFLAGS += CONFIG["MZLA_JSONC_CFLAGS"]
|
|
else:
|
|
IQuote("{}/../json-c".format(OBJDIR))
|
|
- LOCAL_INCLUDES += ["../json-c"]
|
|
+ LOCAL_INCLUDES += ["!../json-c", "../json-c"]
|
|
|
|
if CONFIG["MZLA_SYSTEM_BZIP2"]:
|
|
CXXFLAGS += CONFIG["MZLA_BZIP2_CFLAGS"]
|
|
else:
|
|
LOCAL_INCLUDES += ["../bzip2"]
|