edited gcc

2 files changed, 22 insertions, 9 deletions

diff --git a/repo/core/gcc.xibuild b/repo/core/gcc.xibuild
index 276560c..19e28ca 100644
--- a/repo/core/gcc.xibuild
+++ b/repo/core/gcc.xibuild
@@ -8,23 +8,36 @@ DESC="The GNU Compiler Collection - C and C++ frontends"
 
 
 build () {
+    #fix an issue breaking libasan.a
+
+    sed -e '/static.*SIGSTKSZ/d' \
+    -e 's/return kAltStackSize/return SIGSTKSZ * 4/' \
+    -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp
+
     case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
-        -i.orig gcc/config/i386/t-linux64
-  ;;
-esac
+      x86_64)
+        sed -e '/m64=/s/lib64/lib/' \
+            -i.orig gcc/config/i386/t-linux64
+      ;;
+    esac
 
-    
 
     mkdir -v build
     cd build
-    ../configure --prefix=/usr --disable-multilib
+
+    ../configure --prefix=/usr            \
+             LD=ld                    \
+             --enable-languages=c,c++ \
+             --disable-multilib       \
+             --disable-bootstrap      \
+             --with-system-zlib
+
     make
+
     make DESTDIR=$PKG_DEST install
 }
 
 
 package () {
-    ln -sv /usr/bin/gcc $PKG_DEST/lib/cpp
+    ln -svr /usr/bin/cpp $PKG_DEST/usr/lib
 }
diff --git a/repo/extra/xibuild.xibuild b/repo/extra/xibuild.xibuild
index 029efdc..0b001b0 100644
--- a/repo/extra/xibuild.xibuild
+++ b/repo/extra/xibuild.xibuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEPS=(bash tar)
+DEPS=(bash tar git hg curl openssl )
 
 SOURCE=https://git.davidovski.xyz/xilinux/xibuild.git
 DESC="The build system for xilinux used to build packages and maintain repositories"