Skip to content

Commit 8eceee7

Browse files
Peter Arganyfacebook-github-bot
Peter Argany
authored andcommitted
Fix Hermes build on folly 2021.04.26.00
Summary: This fixes multiple compile errors when building RNTester with Hermes enabled: - `Typedef redefinition with different types ('uint8_t' (aka 'unsigned char') vs 'enum clockid_t')` - `'event2/event-config.h' file not found` - tons of missing files (all added to RCT-Folly/Futures) Changelog: [iOS] Fix Hermes build on folly version 2021.04.26.00 allow-large-files Reviewed By: RSNara Differential Revision: D28128087 fbshipit-source-id: ee7cb6fda72d00d22f6182d958aa8ba55939f158
1 parent 7579ed3 commit 8eceee7

File tree

4 files changed

+79
-70
lines changed

4 files changed

+79
-70
lines changed

ReactCommon/hermes/React-hermes.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ else
1616
source[:tag] = "v#{version}"
1717
end
1818

19-
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
19+
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
2020
folly_version = '2021.04.26.00'
2121
boost_compiler_flags = '-Wno-documentation'
2222

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
3636
s.public_header_files = "executor/HermesExecutorFactory.h"
3737
s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
3838
s.pod_target_xcconfig = {
39-
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"",
39+
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\"",
4040
"GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1",
4141
}
4242
s.header_dir = "reacthermes"
@@ -46,8 +46,8 @@ Pod::Spec.new do |s|
4646
s.dependency "React-jsinspector", version
4747
s.dependency "React-perflogger", version
4848
s.dependency "RCT-Folly", folly_version
49-
s.dependency "RCT-Folly/Futures", folly_version
5049
s.dependency "DoubleConversion"
5150
s.dependency "glog"
51+
s.dependency "RCT-Folly/Futures", folly_version
5252
s.dependency "hermes-engine"
5353
end

packages/rn-tester/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ SPEC CHECKSUMS:
857857
glog: 5337263514dd6f09803962437687240c5dc39aa4
858858
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
859859
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
860-
RCT-Folly: ed150a9621ca98972042998fa33bdfed325c2801
860+
RCT-Folly: c2df3efe85970e635de36ef663ce1e98a1c84981
861861
RCTRequired: af2d6080a4b9ba0885b28ca78879a92066c71cab
862862
RCTTypeSafety: f5405e0143bb2addae97ce33e4c87d9284a48fe2
863863
React: f64c9f6db5428717922a3292ba6a448615a2e143

0 commit comments

Comments
 (0)