summaryrefslogtreecommitdiff
path: root/src/compilers
diff options
context:
space:
mode:
Diffstat (limited to 'src/compilers')
-rw-r--r--src/compilers/clang-16-native.TARGETS16
-rw-r--r--src/compilers/clang-17-native.TARGETS16
-rw-r--r--src/compilers/gcc-13-musl-static.TARGETS9
-rw-r--r--src/compilers/gcc-13-musl.TARGETS13
-rw-r--r--src/compilers/gcc-13-native.TARGETS11
5 files changed, 37 insertions, 28 deletions
diff --git a/src/compilers/clang-16-native.TARGETS b/src/compilers/clang-16-native.TARGETS
index 1b256fc..cafed88 100644
--- a/src/compilers/clang-16-native.TARGETS
+++ b/src/compilers/clang-16-native.TARGETS
@@ -187,15 +187,15 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libstdc++.so.6"]
+ , "cmds": ["cp -L lib64/libstdc++.so.6 ."]
+ , "outs": ["libstdc++.so.6"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
, "libc++_files":
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": ["cp lib/$(uname -m)-*/libc++.so.1 ."]
+ , "cmds": ["cp -L lib/$(uname -m)-*/libc++.so.1 ."]
, "outs": ["libc++.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
@@ -203,7 +203,7 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": ["cp lib/$(uname -m)-*/libc++abi.so.1 ."]
+ , "cmds": ["cp -L lib/$(uname -m)-*/libc++abi.so.1 ."]
, "outs": ["libc++abi.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
@@ -211,16 +211,16 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libgcc_s.so.1"]
+ , "cmds": ["cp -L lib64/libgcc_s.so.1 ."]
+ , "outs": ["libgcc_s.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
, "libatomic_files":
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libatomic.so.1"]
+ , "cmds": ["cp -L lib64/libatomic.so.1 ."]
+ , "outs": ["libatomic.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
}
diff --git a/src/compilers/clang-17-native.TARGETS b/src/compilers/clang-17-native.TARGETS
index 64ff374..498949a 100644
--- a/src/compilers/clang-17-native.TARGETS
+++ b/src/compilers/clang-17-native.TARGETS
@@ -187,15 +187,15 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libstdc++.so.6"]
+ , "cmds": ["cp -L lib64/libstdc++.so.6 ."]
+ , "outs": ["libstdc++.so.6"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
, "libc++_files":
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": ["cp lib/$(uname -m)-*/libc++.so.1 ."]
+ , "cmds": ["cp -L lib/$(uname -m)-*/libc++.so.1 ."]
, "outs": ["libc++.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
@@ -203,7 +203,7 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": ["cp lib/$(uname -m)-*/libc++abi.so.1 ."]
+ , "cmds": ["cp -L lib/$(uname -m)-*/libc++abi.so.1 ."]
, "outs": ["libc++abi.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
@@ -211,16 +211,16 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libgcc_s.so.1"]
+ , "cmds": ["cp -L lib64/libgcc_s.so.1 ."]
+ , "outs": ["libgcc_s.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
, "libatomic_files":
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libatomic.so.1"]
+ , "cmds": ["cp -L lib64/libatomic.so.1 ."]
+ , "outs": ["libatomic.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
}
diff --git a/src/compilers/gcc-13-musl-static.TARGETS b/src/compilers/gcc-13-musl-static.TARGETS
index d7cefea..109ec85 100644
--- a/src/compilers/gcc-13-musl-static.TARGETS
+++ b/src/compilers/gcc-13-musl-static.TARGETS
@@ -81,7 +81,10 @@
, " cp -l $f $(echo $f | sed 's|/'${TARGET}-'|/|g')"
, "done"
, "cp -rl ./${TARGET}/lib/. ./lib/."
- , "find . -type l ! -exec test -e {} \\; -delete"
+ , "find . -type l -exec sh -c 'expr match \"$(readlink {})\" \"/\" >/dev/null' \\; -delete"
+ , "GCC_LIBDIR=\"lib/gcc/$(./bin/gcc -dumpmachine)/$(./bin/gcc -dumpfullversion -dumpversion)\""
+ , "mv ${GCC_LIBDIR}/include-fixed ${TMPDIR}/"
+ , "cp -rL ${TMPDIR}/include-fixed ${GCC_LIBDIR}/. # resolve symlinks"
]
}
, "out_dirs": ["."]
@@ -114,8 +117,8 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain_for_target"]
- , "cmds": [":"]
- , "outs": ["lib/libgcc_s.so.1"]
+ , "cmds": ["cp -L lib/libgcc_s.so.1 ."]
+ , "outs": ["libgcc_s.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
}
diff --git a/src/compilers/gcc-13-musl.TARGETS b/src/compilers/gcc-13-musl.TARGETS
index 90d7987..ef226eb 100644
--- a/src/compilers/gcc-13-musl.TARGETS
+++ b/src/compilers/gcc-13-musl.TARGETS
@@ -107,7 +107,10 @@
, " cp -l $f $(echo $f | sed 's|/'${TARGET}-'|/|g')"
, "done"
, "cp -rl ./${TARGET}/lib/. ./lib/."
- , "find . -type l ! -exec test -e {} \\; -delete"
+ , "find . -type l -exec sh -c 'expr match \"$(readlink {})\" \"/\" >/dev/null' \\; -delete"
+ , "GCC_LIBDIR=\"lib/gcc/$(./bin/gcc -dumpmachine)/$(./bin/gcc -dumpfullversion -dumpversion)\""
+ , "mv ${GCC_LIBDIR}/include-fixed ${TMPDIR}/"
+ , "cp -rL ${TMPDIR}/include-fixed ${GCC_LIBDIR}/. # resolve symlinks"
]
}
, "out_dirs": ["."]
@@ -146,16 +149,16 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain_for_target"]
- , "cmds": [":"]
- , "outs": ["lib/libstdc++.so.6"]
+ , "cmds": ["cp -L lib/libstdc++.so.6 ."]
+ , "outs": ["libstdc++.so.6"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
, "libgcc_s_files":
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain_for_target"]
- , "cmds": [":"]
- , "outs": ["lib/libgcc_s.so.1"]
+ , "cmds": ["cp -L lib/libgcc_s.so.1 ."]
+ , "outs": ["libgcc_s.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
}
diff --git a/src/compilers/gcc-13-native.TARGETS b/src/compilers/gcc-13-native.TARGETS
index 3b79d36..27cdf80 100644
--- a/src/compilers/gcc-13-native.TARGETS
+++ b/src/compilers/gcc-13-native.TARGETS
@@ -152,6 +152,9 @@
, "find . -type f -name '*.so*' -exec sh -c \"strip {} 2>/dev/null\" \\;"
, "find . -type f -name '*.a' -exec sh -c \"strip -g {}\" \\;"
, "find . -type f -name '*.o' -exec sh -c \"strip -g {}\" \\;"
+ , "GCC_LIBDIR=\"lib/gcc/$(./bin/gcc -dumpmachine)/$(./bin/gcc -dumpfullversion -dumpversion)\""
+ , "mv ${GCC_LIBDIR}/include-fixed ${TMPDIR}/"
+ , "cp -rL ${TMPDIR}/include-fixed ${GCC_LIBDIR}/. # resolve symlinks"
, "if [ -n \"${LINK_ARGS}\" ]; then"
, " cd ${DESTDIR}/bin"
, " mv gcc gcc.real"
@@ -178,16 +181,16 @@
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libstdc++.so.6"]
+ , "cmds": ["cp -L lib64/libstdc++.so.6 ."]
+ , "outs": ["libstdc++.so.6"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
, "libgcc_s_files":
{ "type": "generic"
, "arguments_config": ["ENV"]
, "deps": ["toolchain"]
- , "cmds": [":"]
- , "outs": ["lib64/libgcc_s.so.1"]
+ , "cmds": ["cp -L lib64/libgcc_s.so.1 ."]
+ , "outs": ["libgcc_s.so.1"]
, "env": {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
}
}