blob: b60ea5a376776cdc690b52ea02a8d59c02436964 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Fix the symlinks that submakefiles create so that they don't suck at life.
Don't use target LDFLAGS/CFLAGS when compiling native apps.
--- lib/Makefile.elf-lib
+++ lib/Makefile.elf-lib
@@ -49,3 +49,3 @@
@echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
- @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+ @$(LN_S) -f $(ELF_SONAME) \
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
--- util/Makefile.in
+++ util/Makefile.in
@@ -15,7 +15,7 @@
.c.o:
@echo " CC $<"
- @$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@
+ @$(BUILD_CC) -c $(DEFS) $< -o $@
PROGS= subst
@@ -23,11 +23,11 @@
subst: subst.o
@echo " LD $@"
- @$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o
+ @$(BUILD_CC) -o subst subst.o
copy_sparse: copy_sparse.o
@echo " LD $@"
- @$(BUILD_CC) $(ALL_LDFLAGS) -o copy_sparse copy_sparse.o
+ @$(BUILD_CC) -o copy_sparse copy_sparse.o
gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
@echo " CONFIG.STATUS $@"
--- lib/Makefile.elf-lib
+++ lib/Makefile.elf-lib
@@ -26,7 +26,7 @@
$(ELF_LIB): $(OBJS)
@echo " GEN_ELF_SOLIB $(ELF_LIB)"
- @(cd elfshared; $(CC) --shared -o $(ELF_LIB) \
+ @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
@$(MV) elfshared/$(ELF_LIB) .
@$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
|
GitWeb
