Move --sysroot to LDFLAGS since not used during compilation

This commit is contained in:
Jeffrey Walton 2021-05-10 14:57:43 -04:00
parent 24601ac938
commit 9e2da8980a
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 12 additions and 12 deletions

View File

@ -430,9 +430,9 @@ export CPP CC CXX LD AS AR RANLIB STRIP OBJDUMP
# https://github.com/android/ndk/issues/894#issuecomment-470837964
CPPFLAGS="${ANDROID_CPPFLAGS} -isysroot ${ANDROID_SYSROOT}"
CFLAGS="${ANDROID_CFLAGS} --sysroot ${ANDROID_SYSROOT}"
CXXFLAGS="${ANDROID_CXXFLAGS} --sysroot ${ANDROID_SYSROOT}"
LDFLAGS="${ANDROID_LDFLAGS}"
CFLAGS="${ANDROID_CFLAGS}"
CXXFLAGS="${ANDROID_CXXFLAGS}"
LDFLAGS="${ANDROID_LDFLAGS} --sysroot ${ANDROID_SYSROOT}"
# Trim whitespace as needed
CPPFLAGS=$(echo "${CPPFLAGS}" | awk '{$1=$1;print}')

View File

@ -160,9 +160,9 @@ export IS_ARM_EMBEDDED=1
export CPP CC CXX LD AS AR RANLIB STRIP OBJDUMP
CPPFLAGS="${DEF_CPPFLAGS} ${ARM_EMBEDDED_CPPFLAGS} ${ARM_EMBEDDED_HEADERS} -isysroot ${ARM_EMBEDDED_SYSROOT}"
CFLAGS="${DEF_CFLAGS} ${ARM_EMBEDDED_CFLAGS} --sysroot ${ARM_EMBEDDED_SYSROOT}"
CXXFLAGS="${DEF_CXXFLAGS} ${ARM_EMBEDDED_CXXFLAGS} --sysroot ${ARM_EMBEDDED_SYSROOT}"
LDFLAGS="${DEF_LDFLAGS} ${ARM_EMBEDDED_LDFLAGS}"
CFLAGS="${DEF_CFLAGS} ${ARM_EMBEDDED_CFLAGS}"
CXXFLAGS="${DEF_CXXFLAGS} ${ARM_EMBEDDED_CXXFLAGS}"
LDFLAGS="${DEF_LDFLAGS} ${ARM_EMBEDDED_LDFLAGS} --sysroot ${ARM_EMBEDDED_SYSROOT}"
# Trim whitespace as needed
CPPFLAGS=$(echo "${CPPFLAGS}" | awk '{$1=$1;print}')

View File

@ -373,9 +373,9 @@ export IS_IOS=1
export CPP CC CXX LD AS AR RANLIB STRIP OBJDUMP
CPPFLAGS="${DEF_CPPFLAGS} ${IOS_CPPFLAGS} -isysroot ${IOS_SYSROOT}"
CFLAGS="${DEF_CFLAGS} ${IOS_CFLAGS} --sysroot ${IOS_SYSROOT}"
CXXFLAGS="${DEF_CXXFLAGS} ${IOS_CXXFLAGS} --sysroot ${IOS_SYSROOT}"
LDFLAGS="${DEF_LDFLAGS} ${IOS_LDFLAGS}"
CFLAGS="${DEF_CFLAGS} ${IOS_CFLAGS}"
CXXFLAGS="${DEF_CXXFLAGS} ${IOS_CXXFLAGS}"
LDFLAGS="${DEF_LDFLAGS} ${IOS_LDFLAGS} --sysroot ${IOS_SYSROOT}"
# Trim whitespace as needed
CPPFLAGS=$(echo "${CPPFLAGS}" | awk '{$1=$1;print}')

View File

@ -397,9 +397,9 @@ then
LDFLAGS="${DEF_LDFLAGS} ${MACOS_LDFLAGS} -sysroot=${MACOS_SYSROOT}"
else
CPPFLAGS="${DEF_CPPFLAGS} ${MACOS_CPPFLAGS} -isysroot ${MACOS_SYSROOT}"
CFLAGS="${DEF_CFLAGS} ${MACOS_CFLAGS} --sysroot ${MACOS_SYSROOT}"
CXXFLAGS="${DEF_CXXFLAGS} ${MACOS_CXXFLAGS} --sysroot ${MACOS_SYSROOT}"
LDFLAGS="${DEF_LDFLAGS} ${MACOS_LDFLAGS}"
CFLAGS="${DEF_CFLAGS} ${MACOS_CFLAGS}"
CXXFLAGS="${DEF_CXXFLAGS} ${MACOS_CXXFLAGS}"
LDFLAGS="${DEF_LDFLAGS} ${MACOS_LDFLAGS} --sysroot ${MACOS_SYSROOT}"
fi
# Trim whitespace as needed