llvm.org GIT mirror llvm / d8c53d0
Fixes to Dockerfile scripts. - Put buildfiles into /tmp/clang-build/build, instead of /tmp/clang-build. We checkout the sources to /tmp/clang-build/src and running cmake in /tmp/clang-build was done by mistake. - Don't add an extra ';' at the start of enabled projects list. It worked either way, but looked strange. - Minor comment update. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307258 91177308-0d34-0410-b5e6-96231b3b80d8 Ilya Biryukov 2 years ago
1 changed file(s) with 7 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
7979 fi
8080 if ! contains_project "$PROJ" ; then
8181 LLVM_PROJECTS="$LLVM_PROJECTS $PROJ"
82 CMAKE_LLVM_ENABLE_PROJECTS="$CMAKE_LLVM_ENABLED_PROJECTS;$PROJ"
82 if [ "$CMAKE_LLVM_ENABLE_PROJECTS" != "" ]; then
83 CMAKE_LLVM_ENABLE_PROJECTS="$CMAKE_LLVM_ENABLE_PROJECTS;"
84 fi
85 CMAKE_LLVM_ENABLE_PROJECTS="$CMAKE_LLVM_ENABLED_PROJECTS$PROJ"
8386 else
8487 echo "Project '$PROJ' is already enabled, ignoring extra occurences."
8588 fi
135138 SVN_PROJECT="$LLVM_PROJECT"
136139 fi
137140
138 echo "Checking out http://llvm.org/svn/llvm-project/$SVN_PROJECT to $CLANG_BUILD_DIR/src/$LLVM_PROJECT"
141 echo "Checking out https://llvm.org/svn/llvm-project/$SVN_PROJECT to $CLANG_BUILD_DIR/src/$LLVM_PROJECT"
139142 # FIXME: --trust-server-cert is required to workaround 'SSL issuer is not
140143 # trusted' error. Using https seems preferable to http either way,
141144 # albeit this is not secure.
144147 "$CLANG_BUILD_DIR/src/$LLVM_PROJECT"
145148 done
146149
147 pushd "$CLANG_BUILD_DIR"
150 mkdir "$CLANG_BUILD_DIR/build"
151 pushd "$CLANG_BUILD_DIR/build"
148152
149153 # Run the build as specified in the build arguments.
150154 echo "Running build"
151 mkdir "$CLANG_BUILD_DIR/build"
152155 cmake -GNinja \
153156 -DCMAKE_INSTALL_PREFIX="$CLANG_INSTALL_DIR" \
154157 -DLLVM_ENABLE_PROJECTS="$CMAKE_LLVM_ENABLE_PROJECTS" \