Skip to content
This repository was archived by the owner on Jul 1, 2023. It is now read-only.

Commit 0fa489d

Browse files
authored
build: adjust Swift, Clang, linker flags (#1169)
Use a condensed form of the swift definition. Additionally, pass in the paths to the just built (and installed) X10 library for headers and the linker.
1 parent 68266f9 commit 0fa489d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ RUN git clone https://github.com/deepmind/open_spiel.git
7777
WORKDIR /swift-models
7878

7979
RUN /swift-tensorflow-toolchain/usr/bin/swift build \
80-
$([ "$TENSORFLOW_USE_STANDARD_TOOLCHAIN" = "YES" ] && echo "-Xswiftc -D -Xswiftc TENSORFLOW_USE_STANDARD_TOOLCHAIN")
80+
$([ "$TENSORFLOW_USE_STANDARD_TOOLCHAIN" = "YES" ] && echo "-Xswiftc -DTENSORFLOW_USE_STANDARD_TOOLCHAIN -Xcc -I/swift-tensorflow-toolchain/usr/lib/swift -Xlinker -L/swift-tensorflow-toolchain/usr/lib/swift/linux")
8181
# Swift Numerics in release mode does not currently build, which prevents the use of swift-models
8282
# RUN /swift-tensorflow-toolchain/usr/bin/swift build -c release \
83-
# $([ "$TENSORFLOW_USE_STANDARD_TOOLCHAIN" = "YES" ] && echo "-Xswiftc -D -Xswiftc TENSORFLOW_USE_STANDARD_TOOLCHAIN")
83+
# $([ "$TENSORFLOW_USE_STANDARD_TOOLCHAIN" = "YES" ] && echo "-Xswiftc -DTENSORFLOW_USE_STANDARD_TOOLCHAIN -Xcc -I/swift-tensorflow-toolchain/usr/lib/swift -Xlinker -L/swift-tensorflow-toolchain/usr/lib/swift/linux")
8484

8585
WORKDIR /fastai_dev/swift/FastaiNotebook_11_imagenette
8686

0 commit comments

Comments
 (0)