SUGGESTED FIX
File modes below and comand line list below.. I still think we need to redo the make structure to handle of triplet compilers installed on a given machine. i.e. MULTIARCH
OTHER_CPPFLAGS=-m32 OTHER_CXXFLAGS=-m32 OTHER_LDFLAGS=-m32 OTHER_CFLAGS=-m32 make mach=i586 ARCH_DATA_MODEL=32 ...
Deploy repo will fail to build as well.. We need to add additional flag to use local
setenv ALT_GCC29_COMPILER_PATH /usr If you don't use this path you will get weird error
in plugin build. I will file a seperate bug on that after I discuss options with Plguin team.
diff --git a/make/com/sun/java/pack/Makefile b/make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile
+++ b/make/com/sun/java/pack/Makefile
@@ -72,14 +72,14 @@
$(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
- OTHER_CXXFLAGS += $(ZINCLUDE)
+ CXXFLAGS_COMMON += $(ZINCLUDE)
LDDFLAGS += $(ZIPOBJS)
else
LDDFLAGS += -lz
OTHER_CXXFLAGS += -DSYSTEM_ZLIB
endif
else
- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+ CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
OTHER_LDLIBS += $(JVMLIB)
endif
diff --git a/make/sun/jdbc/Makefile b/make/sun/jdbc/Makefile
--- a/make/sun/jdbc/Makefile
+++ b/make/sun/jdbc/Makefile
@@ -104,7 +104,7 @@
$(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
$(ODBC_FAKE_LIBRARIES): $(TEMPDIR)/dummyodbc.o
@$(prep-target)
- $(CC) $(SHARED_LIBRARY_FLAG) $(LDFLAGS_COMMON) -o $@ $< $(EXTRA_LIBS)
+ $(CC) $(SHARED_LIBRARY_FLAG) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) -o $@ $< $(EXTRA_LIBS)
clean::
$(RM) -f $(ODBC_FAKE_LIBRARIES)
$(RM) -f $(TEMPDIR)/dummyodbc.c
diff --git a/make/sun/security/smartcardio/Makefile b/make/sun/security/smartcardio/Makefile
--- a/make/sun/security/smartcardio/Makefile
+++ b/make/sun/security/smartcardio/Makefile
@@ -75,6 +75,6 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = $(JVMLIB) winscard.lib
else
- OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
- OTHER_CFLAGS = -D__sun_jdk
+ OTHER_LDLIBS += $(LIBDL) $(JVMLIB)
+ OTHER_CFLAGS += -D__sun_jdk
endif
|