Browse Source

- rework linker flags so we can properly use the crosstool linker

p.s. openssh build sucks!
master
gixxpunk 8 years ago
parent
commit
eeb126bd59
  1. 4
      make/environment.mk
  2. 1
      make/system-libs.mk
  3. 8
      make/system-tools.mk

4
make/environment.mk

@ -174,7 +174,7 @@ endif
TARGET_CFLAGS = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) -g -I$(TARGETINCLUDE) TARGET_CFLAGS = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) -g -I$(TARGETINCLUDE)
TARGET_CPPFLAGS = $(TARGET_CFLAGS) TARGET_CPPFLAGS = $(TARGET_CFLAGS)
TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_CXXFLAGS = $(TARGET_CFLAGS)
TARGET_LDFLAGS = $(CORTEX-STRINGS) -Wl,-O1 $(TARGET_EXTRA_LDFLAGS) -L$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB) TARGET_LDFLAGS = $(CORTEX-STRINGS) -Wl,-O1 -Wl,-rpath,$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB) -L$(TARGETLIB) $(TARGET_EXTRA_LDFLAGS)
VPATH = $(D) VPATH = $(D)
@ -213,9 +213,11 @@ CONFIGURE_OPTS = \
BUILDENV = \ BUILDENV = \
CC=$(TARGET)-gcc \ CC=$(TARGET)-gcc \
CXX=$(TARGET)-g++ \ CXX=$(TARGET)-g++ \
LD=$(TARGET)-ld \
NM=$(TARGET)-nm \ NM=$(TARGET)-nm \
AR=$(TARGET)-ar \ AR=$(TARGET)-ar \
AS=$(TARGET)-as \ AS=$(TARGET)-as \
LDD=$(TARGET)-ldd \
RANLIB=$(TARGET)-ranlib \ RANLIB=$(TARGET)-ranlib \
STRIP=$(TARGET)-strip \ STRIP=$(TARGET)-strip \
OBJCOPY=$(TARGET)-objcopy \ OBJCOPY=$(TARGET)-objcopy \

1
make/system-libs.mk

@ -31,7 +31,6 @@ $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGETPREFIX)
--disable-static \ --disable-static \
--disable-example \ --disable-example \
--disable-mtab \ --disable-mtab \
--disable-rpath \
--with-gnu-ld \ --with-gnu-ld \
--enable-util \ --enable-util \
--enable-lib \ --enable-lib \

8
make/system-tools.mk

@ -29,13 +29,16 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
$(UNTAR)/openssh-$(OPENSSH_VER).tar.gz $(UNTAR)/openssh-$(OPENSSH_VER).tar.gz
cd $(BUILD_TMP)/openssh-$(OPENSSH_VER) && \ cd $(BUILD_TMP)/openssh-$(OPENSSH_VER) && \
export ac_cv_search_dlopen=no && \ export ac_cv_search_dlopen=no && \
$(CONFIGURE) \ ./configure \
$(CONFIGURE_OPTS) \
--prefix= \ --prefix= \
--mandir=/.remove \ --mandir=/.remove \
--docdir=/.remove \ --docdir=/.remove \
--infodir=/.remove \ --infodir=/.remove \
--with-pid-dir=/tmp \ --with-pid-dir=/tmp \
--with-privsep-path=/var/empty \ --with-privsep-path=/var/empty \
--with-cppflags="-pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) -g -I$(TARGETINCLUDE)" \
--with-ldflags="-L$(TARGETLIB)" \
--libexecdir=/bin \ --libexecdir=/bin \
--disable-strip \ --disable-strip \
--disable-lastlog \ --disable-lastlog \
@ -878,7 +881,6 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGETPREFIX)
--disable-libasprintf \ --disable-libasprintf \
--disable-acl \ --disable-acl \
--disable-openmp \ --disable-openmp \
--disable-rpath \
--disable-java \ --disable-java \
--disable-native-java \ --disable-native-java \
--disable-csharp \ --disable-csharp \
@ -941,7 +943,6 @@ $(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGETPREFIX)
--mandir=/.remove \ --mandir=/.remove \
--with-gnu-ld \ --with-gnu-ld \
--with-ssl=openssl \ --with-ssl=openssl \
--disable-rpath \
--disable-debug \ --disable-debug \
&& \ && \
$(MAKE) && \ $(MAKE) && \
@ -962,7 +963,6 @@ $(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
--enable-relocatable \ --enable-relocatable \
--disable-rpath \
--datarootdir=/.remove && \ --datarootdir=/.remove && \
$(MAKE) && \ $(MAKE) && \
$(MAKE) install DESTDIR=$(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp $(MAKE) install DESTDIR=$(BUILD_TMP)/libiconv-$(LIBICONV_VER)/tmp

Loading…
Cancel
Save