use --with-build-sysroot when installing via DESTDIR

fixes: #44
jwt27 · Aug 18, 2024 · f3ec351 · f3ec351
1 parent 6679961
commit f3ec351
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/build-djgpp.sh b/build-djgpp.sh
@@ -243,7 +243,13 @@ if [ ! -z ${GCC_VERSION} ]; then
   export CXXFLAGS="$CXXFLAGS $GCC_EXTRA_CXXFLAGS"
 
   GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
-                           --enable-languages=${ENABLE_LANGUAGES}"
+                           --enable-languages=${ENABLE_LANGUAGES}
+                           --with-native-system-header-dir=${PREFIX}/${TARGET}/sys-include"
+
+  if [ ! -z "${DESTDIR}" ]; then
+    GCC_CONFIGURE_OPTIONS+=" --with-build-sysroot=${DESTDIR}"
+  fi
+
   strip_whitespace GCC_CONFIGURE_OPTIONS
 
   if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" == "${GCC_CONFIGURE_OPTIONS}" ]; then

diff --git a/debian/changelog b/debian/changelog
@@ -1,10 +1,10 @@
-djgpp-toolchain (12) unstable; urgency=medium
+djgpp-toolchain (12.1) unstable; urgency=medium
 
   * Set 'Architecture: all' for library packages.
   * binutils version 2.43.
   * gcc version 14.1.0.
 
- -- jwt27 <jwjagersma@gmail.com>  Sat, 17 Aug 2024 16:08:07 +0200
+ -- jwt27 <jwjagersma@gmail.com>  Sun, 18 Aug 2024 17:10:30 +0200
 
 djgpp-toolchain (11) unstable; urgency=medium