[swift-dev] Build failure on s390x

[Vivian Kong]

After apply this commit, the s390x build started to fail:
https://github.com/apple/swift/commit/dc88e51321e0a4f281406c265a91308a06aa517f


The commit added 2 new functions in
stdlib/public/SwiftShims/RuntimeStubs.h.  They are used in
stdlib/public/stubs/CommandLine.cpp with SWIFT_CC(swift) macro.  Since we
use the LLVM's intrinsic "swiftcall" on s390x, this caused a build error.
To fix it we added the SWIFT_CC(swift) macro and #include
"swift/Runtime/Config.h" to RuntimeStubs.h.  We then ran into this build
error:

<module-includes>:9:10: note: in file included from <module-includes>:9:
#include "RuntimeStubs.h"
         ^
/localbox/vivkong/swift/build/Ninja-RelWithDebInfoAssert/swift-linux-s390x/./lib/swift/shims/RuntimeStubs.h:23:10:
 error:
'swift/Runtime/Config.h' file not found
#include "swift/Runtime/Config.h"


I tried modifying stdlib/public/SwiftShims/CMakeLists.txt with

include_directories(
  ${CMAKE_SOURCE_DIR}/include
  )

But that didn't seem to work.  Any suggestions on how to fix this?

Thanks for your help!

Regards,

Vivian Kong
Software Developer
IBM Canada Toronto Lab
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.swift.org/pipermail/swift-dev/attachments/20160809/e06b1e86/attachment.html>