fixes for compilation/linking problems on linux #144
Conversation
| @@ -25,6 +25,8 @@ typedef uint32_t mach_port_t; | |||
| #define MACH_PORT_NULL (0) | |||
| #define MACH_PORT_DEAD (-1) | |||
|
|
|||
| #define VOUCHER_CURRENT ((OS_OBJECT_BRIDGE voucher_t)(void *)~2ul) | |||
There was a problem hiding this comment.
please add:
#if OS_VOUCHER_ACTIVITY_SPI
guards around the uses of it instead
dgrove-oss
force-pushed
the
linux-compile-fixes
branch
2 times, most recently
from
777dd96 to
adc5775
Compare
|
redone as suggested and squashed. Should we try to get the modulemap problem sorted out in this pull request too? (ie, don't merge yet). |
|
I think the modulemap is a different enough issue that goes beyond just simple |
|
(or a separate commit at least anyway) |
|
ok. then I think we are done with this one. How do you want to manage getting the fixes onto both the master and the swift3 branches? |
|
I think @das should cherry-pick your commits on his branch, so I'll assign this to him to do that |
| @@ -29,3 +29,5 @@ config | |||
| configure | |||
| libtool | |||
| .dirstamp | |||
| dispatch/module.modulemap | |||
There was a problem hiding this comment.
these should start with /
else you will ignore any file named dispatch/module.map from the repository which is not what you mean here, see gitignore(5):
o A leading slash matches the beginning of the pathname. For example,
"/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".
IOW foo/bar is the same as /**/foo/bar
|
that all looks very good to me but for the gitignore nit. @das: when you have time, can you cherry pick the changes here on your two pull requests for master & swift-3 ? |
dgrove-oss
force-pushed
the
linux-compile-fixes
branch
from
c22f2da to
2c9f19e
Compare
|
gitignore fixed. This builds for me, so cherry pick at will. I'm now starting to debug to figure out why dispatch_api hangs. Have about an hour left this afternoon. |
|
👍 |
|
I merged to das-darwin-006-merge-master and am cherry-picking onto das-darwin-006-merge-swift-3.0 |
fixes for compilation/linking problems on linux Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
The Makefile.am change to add -ldl for the blocks runtime was something I missed in #139 (it is only needed when building libdispatch with an embedded blocks runtime without including the Swift API).
The rest are minimal fixes to get C compilation to succeed.