summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/wrapper/cpp-wrapper2
-rwxr-xr-xscripts/wrapper/g++-wrapper4
-rwxr-xr-xscripts/wrapper/gcc-wrapper4
-rw-r--r--scripts/wrapper/libwrapper.sh12
4 files changed, 11 insertions, 11 deletions
diff --git a/scripts/wrapper/cpp-wrapper b/scripts/wrapper/cpp-wrapper
index b57291e09..35c6e7262 100755
--- a/scripts/wrapper/cpp-wrapper
+++ b/scripts/wrapper/cpp-wrapper
@@ -8,6 +8,6 @@ LINKING=false
unset PTXDIST_CCACHE
cc_add_fortify
-cpp_add_extra
+cpp_add_target_extra
wrapper_exec "$@"
diff --git a/scripts/wrapper/g++-wrapper b/scripts/wrapper/g++-wrapper
index 75dbdb442..61e3a64bb 100755
--- a/scripts/wrapper/g++-wrapper
+++ b/scripts/wrapper/g++-wrapper
@@ -4,10 +4,10 @@
cc_check_args "${@}"
-cc_add_ld_args
+cc_add_target_ld_args
cc_add_fortify
cc_add_stack
cc_add_pie
-cxx_add_extra
+cxx_add_target_extra
wrapper_exec "$@"
diff --git a/scripts/wrapper/gcc-wrapper b/scripts/wrapper/gcc-wrapper
index ad046ad2e..6b75f6fa1 100755
--- a/scripts/wrapper/gcc-wrapper
+++ b/scripts/wrapper/gcc-wrapper
@@ -4,10 +4,10 @@
cc_check_args "${@}"
-cc_add_ld_args
+cc_add_target_ld_args
cc_add_fortify
cc_add_stack
cc_add_pie
-cc_add_extra
+cc_add_target_extra
wrapper_exec "$@"
diff --git a/scripts/wrapper/libwrapper.sh b/scripts/wrapper/libwrapper.sh
index 7aec6b3d8..6b2e204ba 100644
--- a/scripts/wrapper/libwrapper.sh
+++ b/scripts/wrapper/libwrapper.sh
@@ -113,7 +113,7 @@ ld_add_ld_args() {
fi
}
-cc_add_ld_args() {
+cc_add_target_ld_args() {
if ${LINKING}; then
add_ld_args "-Wl,"
add_late_arg ${PTXDIST_CROSS_LDFLAGS}
@@ -145,18 +145,18 @@ cc_add_pie() {
fi
}
-cpp_add_extra() {
+cpp_add_target_extra() {
add_arg -frecord-gcc-switches
add_arg ${PTXDIST_CROSS_CPPFLAGS}
add_opt_arg TARGET_EXTRA_CPPFLAGS ${PTXCONF_TARGET_EXTRA_CPPFLAGS}
}
-cc_add_extra() {
- cpp_add_extra
+cc_add_target_extra() {
+ cpp_add_target_extra
add_opt_arg TARGET_EXTRA_CFLAGS ${PTXCONF_TARGET_EXTRA_CFLAGS}
}
-cxx_add_extra() {
- cpp_add_extra
+cxx_add_target_extra() {
+ cpp_add_target_extra
add_opt_arg TARGET_EXTRA_CXXFLAGS ${PTXCONF_TARGET_EXTRA_CXXFLAGS}
}