Merge pull request #3122 from gottesmm/use_cmarkbuildtype_instead_of_llvmbuildtype_for_cmark_cmakebuildtype

swift-ci · web-flow · commit e0132820f7fd · 2016-06-21T20:23:24.000-07:00
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -1745,7 +1745,7 @@ for host in "${ALL_HOSTS[@]}"; do
             cmark)
                 cmake_options=(
                   "${cmake_options[@]}"
-                  -DCMAKE_BUILD_TYPE:STRING="${LLVM_BUILD_TYPE}"
+                  -DCMAKE_BUILD_TYPE:STRING="${CMARK_BUILD_TYPE}"
                   "${cmark_cmake_options[@]}"
                 )
                 skip_build=${SKIP_BUILD_CMARK}

Original file line number	Diff line number	Diff line change
`@@ -1745,7 +1745,7 @@ for host in "${ALL_HOSTS[@]}"; do`
`1745`	`1745`	`cmark)`
`1746`	`1746`	`cmake_options=(`
`1747`	`1747`	`"${cmake_options[@]}"`
`1748`		`- -DCMAKE_BUILD_TYPE:STRING="${LLVM_BUILD_TYPE}"`
	`1748`	`+ -DCMAKE_BUILD_TYPE:STRING="${CMARK_BUILD_TYPE}"`
`1749`	`1749`	`"${cmark_cmake_options[@]}"`
`1750`	`1750`	`)`
`1751`	`1751`	`skip_build=${SKIP_BUILD_CMARK}`