blob: 68f858167ffe38cf8dbd394226f4b61c6f7287f1 (
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
|
Index: openjdk/jdk/make/java/npt/Makefile
===================================================================
--- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200
+++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200
@@ -65,6 +65,8 @@
# We don't want to link against -ljava
JAVALIB=
+LDLIBS += -liconv
+
# Add -export options to explicitly spell exported symbols
ifeq ($(PLATFORM), windows)
OTHER_LCF += -export:nptInitialize -export:nptTerminate
Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
===================================================================
--- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200
+++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200
@@ -123,6 +123,8 @@
# We don't want to link against -ljava
JAVALIB=
+LDLIBS += -liconv
+
#
# Add to ambient vpath so we pick up the library files
#
Index: openjdk/jdk/make/sun/splashscreen/Makefile
===================================================================
--- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200
+++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200
@@ -55,6 +55,8 @@
JAVALIB=
+LDLIBS += -liconv
+
#
# C Flags
#
|
