author | kergoth <kergoth> | 2002-10-13 23:02:13 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-10-13 23:02:13 (UTC) |
commit | 72c07a1db3bad19fa227fc6fb482afe517d18095 (patch) (unidiff) | |
tree | 4cc5e7a9d5df7935a0cb93c569523b452d9d3972 | |
parent | 44957286ba1f66c37100e764de7e61d3a7a7bab6 (diff) | |
download | opie-72c07a1db3bad19fa227fc6fb482afe517d18095.zip opie-72c07a1db3bad19fa227fc6fb482afe517d18095.tar.gz opie-72c07a1db3bad19fa227fc6fb482afe517d18095.tar.bz2 |
Should be using arm-linux-gcc, not arm-linux-g++, to link
-rw-r--r-- | configs/linux-sharp-g++-shared | 4 | ||||
-rw-r--r-- | configs/linux-sharp-g++-shared-debug | 4 | ||||
-rw-r--r-- | configs/linux-sharp-g++-static | 4 | ||||
-rw-r--r-- | configs/linux-sharp-g++-static-debug | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/configs/linux-sharp-g++-shared b/configs/linux-sharp-g++-shared index 1654f00..9c1dd03 100644 --- a/configs/linux-sharp-g++-shared +++ b/configs/linux-sharp-g++-shared | |||
@@ -27,17 +27,17 @@ SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX) | |||
27 | SYSCONF_LIBS_QT_OPENGL= | 27 | SYSCONF_LIBS_QT_OPENGL= |
28 | # OpenGL | 28 | # OpenGL |
29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | 29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib |
30 | SYSCONF_LIBS_OPENGL= | 30 | SYSCONF_LIBS_OPENGL= |
31 | # Yacc | 31 | # Yacc |
32 | SYSCONF_LIBS_YACC= | 32 | SYSCONF_LIBS_YACC= |
33 | 33 | ||
34 | # Linking applications | 34 | # Linking applications |
35 | SYSCONF_LINK = arm-linux-g++ | 35 | SYSCONF_LINK = arm-linux-gcc |
36 | SYSCONF_LFLAGS = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
38 | 38 | ||
39 | # Link flags for shared objects | 39 | # Link flags for shared objects |
40 | SYSCONF_LFLAGS_SHOBJ= -shared | 40 | SYSCONF_LFLAGS_SHOBJ= -shared |
41 | 41 | ||
42 | # Flags for threading | 42 | # Flags for threading |
43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT | 43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT |
@@ -51,17 +51,17 @@ SYSCONF_MOC = $(QTDIR)/bin/moc | |||
51 | # UI compiler | 51 | # UI compiler |
52 | SYSCONF_UIC = $(QTDIR)/bin/uic | 52 | SYSCONF_UIC = $(QTDIR)/bin/uic |
53 | 53 | ||
54 | # Linking shared libraries | 54 | # Linking shared libraries |
55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | 55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 |
56 | # - Place target in $(DESTDIR) - which has a trailing / | 56 | # - Place target in $(DESTDIR) - which has a trailing / |
57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | 57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) |
58 | # | 58 | # |
59 | SYSCONF_LINK_SHLIB= arm-linux-g++ | 59 | SYSCONF_LINK_SHLIB= arm-linux-gcc |
60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | 60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) |
61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ | 61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ |
62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | 62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ |
63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | 63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ |
64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | 64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ |
65 | cd $(DESTDIR) && \ | 65 | cd $(DESTDIR) && \ |
66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ | 66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ |
67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ | 67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ |
diff --git a/configs/linux-sharp-g++-shared-debug b/configs/linux-sharp-g++-shared-debug index 60d1224..810eef5 100644 --- a/configs/linux-sharp-g++-shared-debug +++ b/configs/linux-sharp-g++-shared-debug | |||
@@ -27,17 +27,17 @@ SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX) | |||
27 | SYSCONF_LIBS_QT_OPENGL= | 27 | SYSCONF_LIBS_QT_OPENGL= |
28 | # OpenGL | 28 | # OpenGL |
29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | 29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib |
30 | SYSCONF_LIBS_OPENGL= | 30 | SYSCONF_LIBS_OPENGL= |
31 | # Yacc | 31 | # Yacc |
32 | SYSCONF_LIBS_YACC= | 32 | SYSCONF_LIBS_YACC= |
33 | 33 | ||
34 | # Linking applications | 34 | # Linking applications |
35 | SYSCONF_LINK = arm-linux-g++ | 35 | SYSCONF_LINK = arm-linux-gcc |
36 | SYSCONF_LFLAGS = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
38 | 38 | ||
39 | # Link flags for shared objects | 39 | # Link flags for shared objects |
40 | SYSCONF_LFLAGS_SHOBJ= -shared | 40 | SYSCONF_LFLAGS_SHOBJ= -shared |
41 | 41 | ||
42 | # Flags for threading | 42 | # Flags for threading |
43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT | 43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT |
@@ -51,17 +51,17 @@ SYSCONF_MOC = $(QTDIR)/bin/moc | |||
51 | # UI compiler | 51 | # UI compiler |
52 | SYSCONF_UIC = $(QTDIR)/bin/uic | 52 | SYSCONF_UIC = $(QTDIR)/bin/uic |
53 | 53 | ||
54 | # Linking shared libraries | 54 | # Linking shared libraries |
55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | 55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 |
56 | # - Place target in $(DESTDIR) - which has a trailing / | 56 | # - Place target in $(DESTDIR) - which has a trailing / |
57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | 57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) |
58 | # | 58 | # |
59 | SYSCONF_LINK_SHLIB= arm-linux-g++ | 59 | SYSCONF_LINK_SHLIB= arm-linux-gcc |
60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | 60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) |
61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ | 61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ |
62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | 62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ |
63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | 63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ |
64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | 64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ |
65 | cd $(DESTDIR) && \ | 65 | cd $(DESTDIR) && \ |
66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ | 66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ |
67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ | 67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ |
diff --git a/configs/linux-sharp-g++-static b/configs/linux-sharp-g++-static index a575482..15e4c7f 100644 --- a/configs/linux-sharp-g++-static +++ b/configs/linux-sharp-g++-static | |||
@@ -27,17 +27,17 @@ SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX) | |||
27 | SYSCONF_LIBS_QT_OPENGL= | 27 | SYSCONF_LIBS_QT_OPENGL= |
28 | # OpenGL | 28 | # OpenGL |
29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | 29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib |
30 | SYSCONF_LIBS_OPENGL= | 30 | SYSCONF_LIBS_OPENGL= |
31 | # Yacc | 31 | # Yacc |
32 | SYSCONF_LIBS_YACC= | 32 | SYSCONF_LIBS_YACC= |
33 | 33 | ||
34 | # Linking applications | 34 | # Linking applications |
35 | SYSCONF_LINK = arm-linux-g++ | 35 | SYSCONF_LINK = arm-linux-gcc |
36 | SYSCONF_LFLAGS = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
38 | 38 | ||
39 | # Link flags for shared objects | 39 | # Link flags for shared objects |
40 | SYSCONF_LFLAGS_SHOBJ= -shared | 40 | SYSCONF_LFLAGS_SHOBJ= -shared |
41 | 41 | ||
42 | # Flags for threading | 42 | # Flags for threading |
43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT | 43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT |
@@ -51,17 +51,17 @@ SYSCONF_MOC = $(QTDIR)/bin/moc | |||
51 | # UI compiler | 51 | # UI compiler |
52 | SYSCONF_UIC = $(QTDIR)/bin/uic | 52 | SYSCONF_UIC = $(QTDIR)/bin/uic |
53 | 53 | ||
54 | # Linking shared libraries | 54 | # Linking shared libraries |
55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | 55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 |
56 | # - Place target in $(DESTDIR) - which has a trailing / | 56 | # - Place target in $(DESTDIR) - which has a trailing / |
57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | 57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) |
58 | # | 58 | # |
59 | SYSCONF_LINK_SHLIB= arm-linux-g++ | 59 | SYSCONF_LINK_SHLIB= arm-linux-gcc |
60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | 60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) |
61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ | 61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ |
62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | 62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ |
63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | 63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ |
64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | 64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ |
65 | cd $(DESTDIR) && \ | 65 | cd $(DESTDIR) && \ |
66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ | 66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ |
67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ | 67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ |
diff --git a/configs/linux-sharp-g++-static-debug b/configs/linux-sharp-g++-static-debug index e5b0ac8..d7715ed 100644 --- a/configs/linux-sharp-g++-static-debug +++ b/configs/linux-sharp-g++-static-debug | |||
@@ -27,17 +27,17 @@ SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX) | |||
27 | SYSCONF_LIBS_QT_OPENGL= | 27 | SYSCONF_LIBS_QT_OPENGL= |
28 | # OpenGL | 28 | # OpenGL |
29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | 29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib |
30 | SYSCONF_LIBS_OPENGL= | 30 | SYSCONF_LIBS_OPENGL= |
31 | # Yacc | 31 | # Yacc |
32 | SYSCONF_LIBS_YACC= | 32 | SYSCONF_LIBS_YACC= |
33 | 33 | ||
34 | # Linking applications | 34 | # Linking applications |
35 | SYSCONF_LINK = arm-linux-g++ | 35 | SYSCONF_LINK = arm-linux-gcc |
36 | SYSCONF_LFLAGS = | 36 | SYSCONF_LFLAGS = |
37 | SYSCONF_LIBS = | 37 | SYSCONF_LIBS = |
38 | 38 | ||
39 | # Link flags for shared objects | 39 | # Link flags for shared objects |
40 | SYSCONF_LFLAGS_SHOBJ= -shared | 40 | SYSCONF_LFLAGS_SHOBJ= -shared |
41 | 41 | ||
42 | # Flags for threading | 42 | # Flags for threading |
43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT | 43 | SYSCONF_CFLAGS_THREAD= -D_REENTRANT |
@@ -51,17 +51,17 @@ SYSCONF_MOC = $(QTDIR)/bin/moc | |||
51 | # UI compiler | 51 | # UI compiler |
52 | SYSCONF_UIC = $(QTDIR)/bin/uic | 52 | SYSCONF_UIC = $(QTDIR)/bin/uic |
53 | 53 | ||
54 | # Linking shared libraries | 54 | # Linking shared libraries |
55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | 55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 |
56 | # - Place target in $(DESTDIR) - which has a trailing / | 56 | # - Place target in $(DESTDIR) - which has a trailing / |
57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | 57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) |
58 | # | 58 | # |
59 | SYSCONF_LINK_SHLIB= arm-linux-g++ | 59 | SYSCONF_LINK_SHLIB= arm-linux-gcc |
60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | 60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) |
61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ | 61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ |
62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | 62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ |
63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | 63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ |
64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | 64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ |
65 | cd $(DESTDIR) && \ | 65 | cd $(DESTDIR) && \ |
66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ | 66 | rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ |
67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ | 67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ |