|
68 | 68 | foundation.LDFLAGS += '-lpthread -ldl -lm -lswiftCore -lxml2 '
|
69 | 69 |
|
70 | 70 | # Configure use of Dispatch in CoreFoundation and Foundation if libdispatch is being built
|
71 |
| -#if "LIBDISPATCH_SOURCE_DIR" in Configuration.current.variables: |
72 |
| -# foundation.CFLAGS += " "+" ".join([ |
73 |
| -# '-DDEPLOYMENT_ENABLE_LIBDISPATCH', |
74 |
| -# '-I'+Configuration.current.variables["LIBDISPATCH_SOURCE_DIR"], |
75 |
| -# '-I'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/tests' # for include of dispatch/private.h in CF |
76 |
| -# ]) |
77 |
| -# swift_cflags += ([ |
78 |
| -# '-DDEPLOYMENT_ENABLE_LIBDISPATCH', |
79 |
| -# '-I'+Configuration.current.variables["LIBDISPATCH_SOURCE_DIR"], |
80 |
| -# '-I'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src', |
81 |
| -# '-Xcc -fblocks' |
82 |
| -# ]) |
83 |
| -# foundation.LDFLAGS += '-ldispatch -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src/.libs -rpath \$$ORIGIN ' |
| 71 | +if "LIBDISPATCH_SOURCE_DIR" in Configuration.current.variables: |
| 72 | + foundation.CFLAGS += " "+" ".join([ |
| 73 | + '-DDEPLOYMENT_ENABLE_LIBDISPATCH', |
| 74 | + '-I'+Configuration.current.variables["LIBDISPATCH_SOURCE_DIR"], |
| 75 | + '-I'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/tests' # for include of dispatch/private.h in CF |
| 76 | + ]) |
| 77 | + swift_cflags += ([ |
| 78 | + '-DDEPLOYMENT_ENABLE_LIBDISPATCH', |
| 79 | + '-I'+Configuration.current.variables["LIBDISPATCH_SOURCE_DIR"], |
| 80 | + '-I'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src', |
| 81 | + '-Xcc -fblocks' |
| 82 | + ]) |
| 83 | + foundation.LDFLAGS += '-ldispatch -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src/.libs -rpath \$$ORIGIN ' |
84 | 84 |
|
85 | 85 | foundation.SWIFTCFLAGS = " ".join(swift_cflags)
|
86 | 86 |
|
|
0 commit comments