Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Makefile builds #184

Merged
merged 1 commit into from
Dec 4, 2015
Merged

Fix Makefile builds #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
-D${PRODUCT}_PATH_TO_CMARK_BUILD:PATH="$(build_directory $deployment_target cmark)"
)

if [[ "${CMAKE_GENERATOR}" != "Ninja" ]] ; then
if [[ "${CMAKE_GENERATOR}" == "Xcode" ]] ; then
swift_cmake_options=(
"${swift_cmake_options[@]-}"
-D${PRODUCT}_CMARK_LIBRARY_DIR:PATH=$(build_directory $deployment_target cmark)/src/$CMARK_BUILD_TYPE
Expand Down Expand Up @@ -1521,7 +1521,7 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
;;

swift)
cmake_options=(${COMMON_CMAKE_OPTIONS[@]})
cmake_options=("${COMMON_CMAKE_OPTIONS[@]}")
if [[ "$USE_GOLD_LINKER" ]]; then
# Swift will selectively use the gold linker on all
# parts except building the standard library. We
Expand Down