Skip to content

Commit 758402f

Browse files
am11am11
committed
Account for thrid dir for gnu
1 parent f998615 commit 758402f

File tree

21 files changed

+63
-43
lines changed

21 files changed

+63
-43
lines changed

‎src/azurelinux/3.0/net10.0/cross/amd64-musl/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ARG ROOTFS_DIR
66
RUN /scripts/eng/common/cross/build-rootfs.sh x64 alpine3.17 --skipunmount
77

88
RUN TARGET_TRIPLE="x86_64-alpine-linux-musl" && \
9-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
10-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
9+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
10+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
11+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1112
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1213
cmake -S llvm-project.src/runtimes -B runtimes \
1314
-DCMAKE_BUILD_TYPE=Release \

‎src/azurelinux/3.0/net10.0/cross/amd64-sanitizer/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ ARG ROOTFS_DIR
88
RUN /scripts/eng/common/cross/build-rootfs.sh x64 bionic --skipunmount
99

1010
RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
11-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
12-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
11+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
12+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
13+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1314
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1415
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
1516
cmake -S llvm-project.src/runtimes -B runtimes \

‎src/azurelinux/3.0/net10.0/cross/amd64/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ARG ROOTFS_DIR
66
RUN /scripts/eng/common/cross/build-rootfs.sh x64 bionic --skipunmount
77

88
RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
9-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
10-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
11-
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
9+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
10+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
11+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")")
1212
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
1313
cmake -S llvm-project.src/runtimes -B runtimes \
1414
-DCMAKE_BUILD_TYPE=Release \

‎src/azurelinux/3.0/net10.0/cross/arm-musl/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ARG ROOTFS_DIR
66
RUN /scripts/eng/common/cross/build-rootfs.sh arm alpine3.17 --skipunmount
77

88
RUN TARGET_TRIPLE="armv7-alpine-linux-musleabihf" && \
9-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
10-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
9+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
10+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
11+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1112
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1213
cmake -S llvm-project.src/runtimes -B runtimes \
1314
-DCMAKE_BUILD_TYPE=Release \

‎src/azurelinux/3.0/net10.0/cross/arm/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ ARG ROOTFS_DIR
88
RUN /scripts/eng/common/cross/build-rootfs.sh arm jammy no-lldb --skipunmount
99

1010
RUN TARGET_TRIPLE="arm-linux-gnueabihf" && \
11-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
12-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
11+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
12+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
13+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1314
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1415
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
1516
cmake -S llvm-project.src/runtimes -B runtimes \

‎src/azurelinux/3.0/net10.0/cross/arm64-musl/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ARG ROOTFS_DIR
66
RUN /scripts/eng/common/cross/build-rootfs.sh arm64 alpine3.17 --skipunmount
77

88
RUN TARGET_TRIPLE="aarch64-alpine-linux-musl" && \
9-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
10-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
9+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
10+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
11+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1112
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1213
cmake -S llvm-project.src/runtimes -B runtimes \
1314
-DCMAKE_BUILD_TYPE=Release \

‎src/azurelinux/3.0/net10.0/cross/arm64/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ARG ROOTFS_DIR
66
RUN /scripts/eng/common/cross/build-rootfs.sh arm64 bionic --skipunmount
77

88
RUN TARGET_TRIPLE="aarch64-linux-gnu" && \
9-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
10-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
9+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
10+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
11+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1112
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1213
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
1314
cmake -S llvm-project.src/runtimes -B runtimes \

‎src/azurelinux/3.0/net10.0/cross/loongarch64-musl/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ARG ROOTFS_DIR
66
RUN /scripts/eng/common/cross/build-rootfs.sh loongarch64 alpineedge --skipemulation
77

88
RUN TARGET_TRIPLE="loongarch64-alpine-linux-musl" && \
9-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
10-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
9+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
10+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
11+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1112
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1213
cmake -S llvm-project.src/runtimes -B runtimes \
1314
-DCMAKE_BUILD_TYPE=Release \

‎src/azurelinux/3.0/net10.0/cross/loongarch64/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ RUN rootfsEnv="/usr/local/share/rootfs" && \
99
PYTHON_EXECUTABLE="$rootfsEnv/bin/python" /scripts/eng/common/cross/build-rootfs.sh loongarch64 sid --skipunmount --skipemulation
1010

1111
RUN TARGET_TRIPLE="loongarch64-linux-gnu" && \
12-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
13-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
12+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
13+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
14+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1415
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1516
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
1617
cmake -S llvm-project.src/runtimes -B runtimes \

‎src/azurelinux/3.0/net10.0/cross/riscv64-musl/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ARG ROOTFS_DIR
66
RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 alpine3.20 --skipunmount
77

88
RUN TARGET_TRIPLE="riscv64-alpine-linux-musl" && \
9-
CPP_INCLUDES=$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1) && \
10-
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE") && \
9+
GCC_VER=$(basename "$(find "$ROOTFS_DIR/usr/include/c++/" -mindepth 1 -maxdepth 1 -type d | sort -V | head -n1)") && \
10+
CPP_INCLUDES="$ROOTFS_DIR/usr/include/c++/$GCC_VER" && \
11+
TRIPLET_INCLUDES=$([ -e "$CPP_INCLUDES/$TARGET_TRIPLE" ] && echo "$CPP_INCLUDES/$TARGET_TRIPLE" || echo "$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE");$(realpath "$CPP_INCLUDES/../../$TARGET_TRIPLE/c++/$GCC_VER")") && \
1112
echo "Using C++ includes $CPP_INCLUDES and $TRIPLET_INCLUDES to build for $TARGET_TRIPLE" && \
1213
cmake -S llvm-project.src/runtimes -B runtimes \
1314
-DCMAKE_BUILD_TYPE=Release \

0 commit comments

Comments
 (0)