Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions

• Component: WebKit Misc.
• Status: RESOLVED FIXED

[Wenson Hsieh]

Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing WebKitAdditions

[Wenson Hsieh]

Created attachment 300046 [details]
Patch

[Wenson Hsieh]

Comment on attachment 300046 [details]
Patch

Thanks Dan!

[WebKit Commit Bot]

Comment on attachment 300046 [details]
Patch

Clearing flags on attachment: 300046

Committed r211342: <http://trac.webkit.org/changeset/211342>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[JF Bastien]

This seems to break the cmake build:

FAILED: Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o 
/Applications/Xcode.app/Contents/Developer/Toolchains/OSX10.12.xctoolchain/usr/bin/c++   -DBUILDING_WITH_CMAKE=1 -DBUILDING_WTF -DHAVE_CONFIG_H=1 -I../Source/bmalloc -I../Source/WTF -I../Source/WTF/wtf -I../Source/WTF/wtf/dtoa -I../Source/WTF/wtf/persistence -I../Source/WTF/wtf/text -I../Source/WTF/wtf/text/icu -I../Source/WTF/wtf/threads -I../Source/WTF/wtf/unicode -I../Source/ThirdParty -I. -IDerivedSources -I../Source/WTF/wtf/spi/darwin -I../Source/WTF/icu -std=c++1y -fcolor-diagnostics -Qunused-arguments -O3 -DNDEBUG -fno-exceptions -fno-strict-aliasing -fno-rtti   -Wall -Wextra -Wcast-align -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wundef -Wwrite-strings -Wno-parentheses-equality -fPIC -MD -MT Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o -MF Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o.d -o Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o -c ../Source/WTF/wtf/Atomics.cpp
In file included from ../Source/WTF/wtf/Atomics.cpp:26:
In file included from ../Source/WTF/config.h:26:
../Source/WTF/wtf/Platform.h:673:10: fatal error: 'WebKitAdditions/AdditionalFeatureDefines.h' file not found
#include <WebKitAdditions/AdditionalFeatureDefines.h>
         ^


Repro with:

    xcrun cmake -Wno-dev .. -G Ninja \
          -DCMAKE_BUILD_TYPE="Release" \
          -DPORT=Mac
    ninja jsc

(In reply to comment #5)
> This seems to break the cmake build:
> 
> FAILED: Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o 
> /Applications/Xcode.app/Contents/Developer/Toolchains/OSX10.12.xctoolchain/
> usr/bin/c++   -DBUILDING_WITH_CMAKE=1 -DBUILDING_WTF -DHAVE_CONFIG_H=1
> -I../Source/bmalloc -I../Source/WTF -I../Source/WTF/wtf
> -I../Source/WTF/wtf/dtoa -I../Source/WTF/wtf/persistence
> -I../Source/WTF/wtf/text -I../Source/WTF/wtf/text/icu
> -I../Source/WTF/wtf/threads -I../Source/WTF/wtf/unicode
> -I../Source/ThirdParty -I. -IDerivedSources -I../Source/WTF/wtf/spi/darwin
> -I../Source/WTF/icu -std=c++1y -fcolor-diagnostics -Qunused-arguments -O3
> -DNDEBUG -fno-exceptions -fno-strict-aliasing -fno-rtti   -Wall -Wextra
> -Wcast-align -Wformat-security -Wmissing-format-attribute -Wpointer-arith
> -Wundef -Wwrite-strings -Wno-parentheses-equality -fPIC -MD -MT
> Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o -MF
> Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o.d -o
> Source/WTF/wtf/CMakeFiles/WTF.dir/Atomics.cpp.o -c
> ../Source/WTF/wtf/Atomics.cpp
> In file included from ../Source/WTF/wtf/Atomics.cpp:26:
> In file included from ../Source/WTF/config.h:26:
> ../Source/WTF/wtf/Platform.h:673:10: fatal error:
> 'WebKitAdditions/AdditionalFeatureDefines.h' file not found
> #include <WebKitAdditions/AdditionalFeatureDefines.h>
>          ^
> 
> 
> Repro with:
> 
>     xcrun cmake -Wno-dev .. -G Ninja \
>           -DCMAKE_BUILD_TYPE="Release" \
>           -DPORT=Mac
>     ninja jsc

Are you building with the Apple Internal SDK? If so, and if your Apple Internal SDK or build directory doesn’t contain AdditionalFeatureDefines.h, then please use Apple-internal channels to resolve it.

If you are not building with the Apple Internal SDK, then it’s a bug in the cmake build system that USE(APPLE_INTERNAL_SDK) is true when you build, and a cmake-build-system expert would need to fix that.

[JF Bastien]

> Are you building with the Apple Internal SDK? If so, and if your Apple
> Internal SDK or build directory doesn’t contain AdditionalFeatureDefines.h,
> then please use Apple-internal channels to resolve it.
> 
> If you are not building with the Apple Internal SDK, then it’s a bug in the
> cmake build system that USE(APPLE_INTERNAL_SDK) is true when you build, and
> a cmake-build-system expert would need to fix that.

Sorry, I had an in-person chat with Wenson and should have sent an update here.

The problem is:

#if PLATFORM(COCOA)
#if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
#define USE_APPLE_INTERNAL_SDK 1
#endif
#endif

Some internal headers are found in cmake's /DerivedSources/ForwardingHeaders/WebCore/, including CFPriv.h, but new ones aren't found. I was building jsc only, so some part of the build cmake process is missing a dependency.

Maybe that bug only affects Apple employees using the cmake build. Wenson said he'd look into it.

(In reply to comment #7)
> > Are you building with the Apple Internal SDK? If so, and if your Apple
> > Internal SDK or build directory doesn’t contain AdditionalFeatureDefines.h,
> > then please use Apple-internal channels to resolve it.
> > 
> > If you are not building with the Apple Internal SDK, then it’s a bug in the
> > cmake build system that USE(APPLE_INTERNAL_SDK) is true when you build, and
> > a cmake-build-system expert would need to fix that.
> 
> Sorry, I had an in-person chat with Wenson and should have sent an update
> here.
> 
> The problem is:
> 
> #if PLATFORM(COCOA)
> #if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
> #define USE_APPLE_INTERNAL_SDK 1
> #endif
> #endif

Yeah, that code isn’t great (I reviewed it!). USE_APPLE_INTERNAL_SDK should be passed by the build system so that it matches up with the USE_INTERNAL_SDK build setting (normally defined in Base.xcconfig).

[Daniel Bates]

(In reply to comment #8)
> > [...]
> > Sorry, I had an in-person chat with Wenson and should have sent an update
> > here.
> > 
> > The problem is:
> > 
> > #if PLATFORM(COCOA)
> > #if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
> > #define USE_APPLE_INTERNAL_SDK 1
> > #endif
> > #endif
> 
> Yeah, that code isn’t great (I reviewed it!). USE_APPLE_INTERNAL_SDK should
> be passed by the build system so that it matches up with the
> USE_INTERNAL_SDK build setting (normally defined in Base.xcconfig).

The disagreement of the macro define and Xcode build variable is tracked in bug #141947.

[Saam Barati]

This also builds "./Tools/Scripts/build-jsc --release" for Apple employees. It would be nice to fix this.

[Saam Barati]

(In reply to comment #10)
> This also builds "./Tools/Scripts/build-jsc --release" for Apple employees.
> It would be nice to fix this.

Typo:
"This also builds" => "This also breaks"

[Alexey Proskuryakov]

This also caused rdar://problem/30308635