Line 0
Link Here
|
|
|
1 |
--- config/mh-bsd-gcc.orig 2016-03-23 20:50:50 UTC |
2 |
+++ config/mh-bsd-gcc |
3 |
@@ -4,8 +4,8 @@ |
4 |
## others. All Rights Reserved. |
5 |
|
6 |
## Commands to generate dependency files |
7 |
-GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) |
8 |
-GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) |
9 |
+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) |
10 |
+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS) |
11 |
|
12 |
## Flags for position independent code |
13 |
SHAREDLIBCFLAGS = -fPIC |
14 |
@@ -18,10 +18,16 @@ LIBCPPFLAGS = |
15 |
|
16 |
## Compiler switch to embed a runtime search path |
17 |
LD_RPATH= |
18 |
-LD_RPATH_PRE= -Wl,-rpath, |
19 |
+LD_RPATH_PRE = -Wl,-rpath, |
20 |
+ |
21 |
+## These are the library specific LDFLAGS |
22 |
+LDFLAGSICUDT=-nodefaultlibs -nostdlib |
23 |
|
24 |
## Compiler switch to embed a library name |
25 |
-LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) |
26 |
+# The initial tab in the next line is to prevent icu-config from reading it. |
27 |
+ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) |
28 |
+#SH# # We can't depend on MIDDLE_SO_TARGET being set. |
29 |
+#SH# LD_SONAME= |
30 |
|
31 |
## Shared library options |
32 |
LD_SOOPTIONS= -Wl,-Bsymbolic |
33 |
@@ -33,27 +39,27 @@ STATIC_O = ao |
34 |
|
35 |
## Compilation rules |
36 |
%.$(STATIC_O): $(srcdir)/%.c |
37 |
- $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< |
38 |
+ $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -o $@ $<) |
39 |
%.o: $(srcdir)/%.c |
40 |
- $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< |
41 |
+ $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -o $@ $<) |
42 |
|
43 |
%.$(STATIC_O): $(srcdir)/%.cpp |
44 |
- $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< |
45 |
+ $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -o $@ $<) |
46 |
%.o: $(srcdir)/%.cpp |
47 |
- $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< |
48 |
+ $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -o $@ $<) |
49 |
|
50 |
|
51 |
## Dependency rules |
52 |
%.d: $(srcdir)/%.c |
53 |
- @echo "generating dependency information for $<" |
54 |
+ $(call ICU_MSG,(deps)) $< |
55 |
@$(SHELL) -ec '$(GEN_DEPS.c) $< \ |
56 |
- | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ |
57 |
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ |
58 |
[ -s $@ ] || rm -f $@' |
59 |
|
60 |
%.d: $(srcdir)/%.cpp |
61 |
- @echo "generating dependency information for $<" |
62 |
+ $(call ICU_MSG,(deps)) $< |
63 |
@$(SHELL) -ec '$(GEN_DEPS.cc) $< \ |
64 |
- | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ |
65 |
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ |
66 |
[ -s $@ ] || rm -f $@' |
67 |
|
68 |
## Versioned libraries rules |
69 |
@@ -64,7 +70,7 @@ STATIC_O = ao |
70 |
$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ |
71 |
|
72 |
## Bind internal references |
73 |
- |
74 |
+ |
75 |
# LDflags that pkgdata will use |
76 |
BIR_LDFLAGS= -Wl,-Bsymbolic |
77 |
|
78 |
@@ -77,4 +83,3 @@ STATIC_PREFIX = |
79 |
|
80 |
## End BSD-specific setup |
81 |
|
82 |
- |