Skip to content

Commit 7fb3d00

Browse files
seabayleaparkera
authored andcommitted
Activate the ability to integrate libdispatch (#424)
1 parent e74f745 commit 7fb3d00

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

build.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@
6868
foundation.LDFLAGS += '-lpthread -ldl -lm -lswiftCore -lxml2 '
6969

7070
# 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 '
8484

8585
foundation.SWIFTCFLAGS = " ".join(swift_cflags)
8686

0 commit comments

Comments
 (0)