Skip to content

Commit 3dec2d4

Browse files
committed
[firefly] handle rename
1 parent 364bd52 commit 3dec2d4

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ clean: ## Clean up generated artifacts
2424
llvm: llvm-without-docs ## Build LLVM (alias for llvm-without-docs)
2525

2626
llvm-shared: disable-docs ## Build LLVM with BUILD_SHARED_LIBS=ON
27-
CC=$(CC) CXX=$(CXX) lumen/utils/dist/build-dist.sh \
27+
CC=$(CC) CXX=$(CXX) firefly/utils/dist/build-dist.sh \
2828
--release="$(RELEASE)" \
2929
--flavor="$(FLAVOR)" \
3030
--targets="$(TARGET_SUPPORT)" \
3131
--with-dylib \
3232
--link-dylib \
3333
--with-assertions \
3434
--build-dir=$(CWD)/build/host_shared \
35-
--install-dir=$(XDG_DATA_HOME)/llvm/lumen \
35+
--install-dir=$(XDG_DATA_HOME)/llvm/firefly \
3636
--skip-dist
3737

3838
check-mlir:
3939
cd build/host/stage2/RelWithDebInfo/stage2-$(RELEASE).obj && ninja check-mlir
4040

4141
llvm-with-docs: enable-docs ## Build LLVM w/documentation
42-
CC=$(CC) CXX=$(CXX) lumen/utils/dist/build-dist.sh \
42+
CC=$(CC) CXX=$(CXX) firefly/utils/dist/build-dist.sh \
4343
--release="$(RELEASE)" \
4444
--flavor="$(FLAVOR)" \
4545
--targets="$(TARGET_SUPPORT)" \
@@ -51,13 +51,13 @@ llvm-with-docs: enable-docs ## Build LLVM w/documentation
5151

5252

5353
llvm-without-docs: disable-docs ## Build LLVM w/o documentation
54-
CC=$(CC) CXX=$(CXX) lumen/utils/dist/build-dist.sh \
54+
CC=$(CC) CXX=$(CXX) firefly/utils/dist/build-dist.sh \
5555
--release="$(RELEASE)" \
5656
--flavor="$(FLAVOR)" \
5757
--targets="$(TARGET_SUPPORT)" \
5858
--with-assertions \
5959
--build-dir=$(CWD)/build/host \
60-
--install-dir=$(XDG_DATA_HOME)/llvm/lumen \
60+
--install-dir=$(XDG_DATA_HOME)/llvm/firefly \
6161
--skip-dist
6262

6363
enable-docs:
@@ -76,7 +76,7 @@ disable-docs:
7676

7777
dist-macos: ## Build an LLVM release distribution for x86_64-apple-darwin
7878
@mkdir -p build/packages/dist && \
79-
CC=$(CC) CXX=$(CXX) lumen/utils/dist/build-dist.sh \
79+
CC=$(CC) CXX=$(CXX) firefly/utils/dist/build-dist.sh \
8080
--release="$(RELEASE)" \
8181
--flavor="$(FLAVOR)" \
8282
--targets="$(TARGET_SUPPORT)" \
@@ -90,16 +90,16 @@ dist-macos: ## Build an LLVM release distribution for x86_64-apple-darwin
9090

9191
dist-linux: ## Build an LLVM release distribution for x86_64-unknown-linux
9292
@mkdir -p build/packages/ && \
93-
cd lumen/ && \
93+
cd firefly/ && \
9494
docker build \
9595
-t llvm-project:dist-$(RELEASE)-$(SHA) \
9696
--target=dist \
9797
--build-arg buildscript_args="-release=$(RELEASE) -with-dylib -link-dylib -flavor=$(FLAVOR) -clean-obj -j=2" . && \
9898
utils/dist/extract-release.sh -release $(RELEASE) -sha $(SHA)
9999

100100
docker: ## Build a Docker image containing an LLVM distribution
101-
cd lumen/ && \
101+
cd firefly/ && \
102102
docker build \
103-
-t lumen/llvm:latest \
103+
-t firefly/llvm:latest \
104104
--target=release \
105105
--build-arg buildscript_args="-release=$(RELEASE) -with-dylib -link-dylib -flavor=$(FLAVOR) -clean-obj -j=2" .

lumen/Dockerfile renamed to firefly/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#===- lumen/Dockerfile ---------------------------------------------------===//
1+
#===- firefly/Dockerfile ---------------------------------------------------===//
22
#
33
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
# See https://llvm.org/LICENSE.txt for license information.
@@ -7,7 +7,7 @@
77
#===----------------------------------------------------------------------===//
88
# Stage 1. Check out LLVM source code and run the build.
99
FROM launcher.gcr.io/google/debian10:latest AS builder
10-
LABEL maintainer "Lumen Developers"
10+
LABEL maintainer "Firefly Developers"
1111

1212
# Install build dependencies of llvm.
1313
# First, Update the apt's source list and include the sources of the packages.
@@ -57,7 +57,7 @@ ARG buildscript_args
5757

5858
# Checkout the source code.
5959
RUN mkdir -p /tmp/sources && \
60-
git clone --depth=1 --single-branch --branch lumen https://github.com/lumen/llvm-project /tmp/sources
60+
git clone --depth=1 --single-branch --branch firefly https://github.com/lumen/llvm-project /tmp/sources
6161

6262
ADD utils/dist /tmp/scripts
6363

@@ -92,7 +92,7 @@ COPY --from=stage1 /tmp/dist /opt/dist
9292

9393
# Stage 2. Produce a minimal release image with build results.
9494
FROM launcher.gcr.io/google/debian10:latest AS release
95-
LABEL maintainer "Lumen Developers"
95+
LABEL maintainer "Firefly Developers"
9696

9797
# Install packages for minimal useful image.
9898
RUN apt-get update && \

lumen/utils/dist/build-dist.sh renamed to firefly/utils/dist/build-dist.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ function configure_core() {
437437
-DLLVM_INSTALL_TOOLCHAIN_ONLY="$stage_install_toolchain_only" \
438438
-DLLVM_ENABLE_ASSERTIONS="${enable_assertions:OFF}" \
439439
-DLLVM_PARALLEL_COMPILE_JOBS="$num_jobs" \
440-
-DLLVM_VERSION_SUFFIX="-lumen-$release" \
440+
-DLLVM_VERSION_SUFFIX="-firefly-$release" \
441441
-DLLVM_INCLUDE_DOCS="$enable_docs" \
442442
-DLLVM_BUILD_DOCS="$enable_docs" \
443443
-DLLVM_ENABLE_DOXYGEN="$enable_docs" \
@@ -472,7 +472,7 @@ function configure_core() {
472472
-DLLVM_INSTALL_TOOLCHAIN_ONLY="$stage_install_toolchain_only" \
473473
-DLLVM_ENABLE_ASSERTIONS="${enable_assertions:OFF}" \
474474
-DLLVM_PARALLEL_COMPILE_JOBS="$num_jobs" \
475-
-DLLVM_VERSION_SUFFIX="-lumen-$release" \
475+
-DLLVM_VERSION_SUFFIX="-firefly-$release" \
476476
-DLLVM_INCLUDE_DOCS="$enable_docs" \
477477
-DLLVM_BUILD_DOCS="$enable_docs" \
478478
-DLLVM_ENABLE_DOXYGEN="$enable_docs" \
File renamed without changes.

0 commit comments

Comments
 (0)