summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-12-06 04:30:19 +0000
committerEric Andersen <andersen@codepoet.org>2002-12-06 04:30:19 +0000
commitc930dbf89b0bb825fb000b0c3e7a411701ffe2c4 (patch)
tree4daf8a06983b129b4d7e5e28e0686ab9ed6d1de7 /make
parent03c53f24c23ef7b06ffcdb0cbaf0a1bb9446fbb7 (diff)
downloadbuildroot-novena-c930dbf89b0bb825fb000b0c3e7a411701ffe2c4.tar.gz
buildroot-novena-c930dbf89b0bb825fb000b0c3e7a411701ffe2c4.zip
Some updates...
Diffstat (limited to 'make')
-rw-r--r--make/openssl.mk2
-rw-r--r--make/uclibc.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/make/openssl.mk b/make/openssl.mk
index 779a6ade8..512bcdc5f 100644
--- a/make/openssl.mk
+++ b/make/openssl.mk
@@ -30,9 +30,9 @@ $(STAGING_DIR)/bin/openssl: $(OPENSSL_DIR)/apps/openssl
make CC=$(TARGET_CC1) -C $(OPENSSL_DIR) install
$(TARGET_DIR)/bin/openssl: $(STAGING_DIR)/bin/openssl
- cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/
cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/
cp -fa $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/
+ #cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/
openssl-clean:
rm -f $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/openssl
diff --git a/make/uclibc.mk b/make/uclibc.mk
index 9cdbebaf2..68594af4e 100644
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -61,6 +61,8 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"$(STAGING_DIR)\",g' $(UCLIBC_DIR)/.config
perl -i -p -e 's,^DEVEL_TOOL_PREFIX=.*,DEVEL_TOOL_PREFIX=\"$(STAGING_DIR)/usr\",g' $(UCLIBC_DIR)/.config
perl -i -p -e 's,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH=\"/lib\",g' $(UCLIBC_DIR)/.config
+ perl -i -p -e 's,^GCC_BIN=.*,GCC_BIN=$(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc,g' $(UCLIBC_DIR)/extra/gcc-uClibc/Makefile
+ perl -i -p -e 's,^LD_BIN=.*,LD_BIN=$(STAGING_DIR)/bin/$(ARCH)-uclibc-ld,g' $(UCLIBC_DIR)/extra/gcc-uClibc/Makefile
$(MAKE) -C $(UCLIBC_DIR) oldconfig
touch $(UCLIBC_DIR)/.configured