Skip to content

Commit 03100ef

Browse files
committed
build: do not consult the legacy staging location for libdispatch
Use the proper output location from CMake for linking. This will allow us to clean up the staging from the libdispatch build system.
1 parent 4157d9b commit 03100ef

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
'-I'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src/swift',
127127
'-Xcc -fblocks'
128128
])
129-
foundation.LDFLAGS += '-ldispatch -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src/.libs -rpath \$$ORIGIN '
129+
foundation.LDFLAGS += '-ldispatch -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src -rpath \$$ORIGIN '
130130
foundation.LDFLAGS += '-L' + Configuration.current.variables['LIBDISPATCH_BUILD_DIR'] + ' -lBlocksRuntime '
131131

132132
foundation.SWIFTCFLAGS = " ".join(swift_cflags)
@@ -541,7 +541,7 @@
541541
'TestFoundation/Utilities.swift',
542542
] + glob.glob('./TestFoundation/Test*.swift')) # all TestSomething.swift are considered sources to the test project in the TestFoundation directory
543543

544-
Configuration.current.extra_ld_flags += ' -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src/.libs'
544+
Configuration.current.extra_ld_flags += ' -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src'
545545

546546
foundation_tests.add_dependency(foundation_tests_resources)
547547
xdgTestHelper = SwiftExecutable('xdgTestHelper',
@@ -561,7 +561,7 @@
561561
if "XCTEST_BUILD_DIR" in Configuration.current.variables:
562562
LIBS_DIRS += "${XCTEST_BUILD_DIR}:"
563563
if "LIBDISPATCH_BUILD_DIR" in Configuration.current.variables:
564-
LIBS_DIRS += Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+"/src/.libs:"
564+
LIBS_DIRS += Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+"/src:"
565565

566566
Configuration.current.variables["LIBS_DIRS"] = LIBS_DIRS
567567

0 commit comments

Comments
 (0)