projects / packages / uClibc.git / blame
| Commit | Line | Data |
|---|---|---|
| 90de3b5b JB |
1 | --- uClibc-0.9.26/extra/Configs/Config.in.orig 2004-01-03 00:34:12.000000000 +0100 |
| 2 | +++ uClibc-0.9.26/extra/Configs/Config.in 2004-01-31 17:48:09.355223576 +0100 | |
| 3 | @@ -1018,7 +1018,7 @@ | |
| 4 | ||
| 5 | config RUNTIME_PREFIX | |
| 6 | string "uClibc runtime library directory" | |
| 7 | - default "/usr/$(TARGET_ARCH)-linux-uclibc/" | |
| 8 | + default "/usr/$(TARGET_CPU)-linux-uclibc/" | |
| 9 | help | |
| 10 | RUNTIME_PREFIX is the directory into which the uClibc runtime | |
| 11 | libraries will be installed. The result will look something | |
| 12 | @@ -1036,7 +1036,7 @@ | |
| 1ecf6a0b | 13 | |
| 15afd9ab JB |
14 | config DEVEL_PREFIX |
| 15 | string "uClibc development environment directory" | |
| 90de3b5b JB |
16 | - default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/" |
| 17 | + default "/usr/$(TARGET_CPU)-linux-uclibc/usr/" | |
| 15afd9ab JB |
18 | help |
| 19 | DEVEL_PREFIX is the directory into which the uClibc development | |
| 20 | environment will be installed. The result will look something | |
| 90de3b5b JB |
21 | --- uClibc-0.9.26/extra/gcc-uClibc/Makefile.orig 2004-01-31 17:41:23.190969928 +0100 |
| 22 | +++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-31 17:51:11.132589216 +0100 | |
| 23 | @@ -51,38 +51,38 @@ | |
| 1ecf6a0b JB |
24 | endif |
| 25 | ||
| 26 | gcc-uClibc: gcc-uClibc.h gcc-uClibc.c | |
| 317db42e | 27 | - $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc |
| 28 | + $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_CPU)-uclibc-gcc | |
| 90de3b5b | 29 | touch gcc-uClibc |
| 1ecf6a0b JB |
30 | |
| 31 | ld-uClibc: | |
| 32 | - @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld | |
| 33 | - @echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld | |
| 34 | + @echo "#!/bin/sh" > $(TARGET_CPU)-uclibc-ld | |
| 35 | + @echo "# This file was autogenerated by make" >> $(TARGET_CPU)-uclibc-ld | |
| 36 | @echo "$(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/usr/lib -L$(DEVEL_PREFIX)/lib "\ | |
| 37 | - "-L$(UCLIBC_DIR)" >> $(TARGET_ARCH)-uclibc-ld | |
| 38 | - chmod a+x $(TARGET_ARCH)-uclibc-ld | |
| 39 | + "-L$(UCLIBC_DIR)" >> $(TARGET_CPU)-uclibc-ld | |
| 40 | + chmod a+x $(TARGET_CPU)-uclibc-ld | |
| 90de3b5b | 41 | touch ld-uClibc |
| 1ecf6a0b JB |
42 | |
| 43 | install: all | |
| 90de3b5b JB |
44 | install -d $(PREFIX)$(DEVEL_PREFIX)/bin; |
| 45 | install -d $(PREFIX)$(RUNTIME_PREFIX)/bin; | |
| 46 | - install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 47 | - install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 48 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc | |
| 49 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc | |
| 50 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc | |
| 51 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld | |
| 52 | + install -m 755 $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 53 | + install -m 755 $(TARGET_CPU)-uclibc-ld $(PREFIX)$(RUNTIME_PREFIX)/bin/ | |
| 54 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-cc | |
| 55 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc | |
| 56 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc | |
| 57 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld | |
| 15afd9ab | 58 | ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) |
| 90de3b5b JB |
59 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++ |
| 60 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++ | |
| 61 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++ | |
| 62 | - ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++ | |
| 63 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-g++ | |
| 64 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-c++ | |
| 65 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/c++ | |
| 66 | + ln -fs $(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/g++ | |
| 15afd9ab | 67 | endif |
| 1ecf6a0b JB |
68 | for app in addr2line ar as cpp gasp nm objcopy \ |
| 69 | objdump ranlib size strings strip; do \ | |
| 15afd9ab JB |
70 | APPNAME=`which $(CROSS)$${app}`; \ |
| 71 | if [ -x "$$APPNAME" ] ; then \ | |
| 90de3b5b JB |
72 | ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \ |
| 73 | - ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ | |
| 74 | + ln -fs "$$APPNAME" $(PREFIX)$(RUNTIME_PREFIX)/bin/$(TARGET_CPU)-uclibc-$${app}; \ | |
| 15afd9ab | 75 | fi; \ |
| 1ecf6a0b JB |
76 | done |
| 77 |