From f6cd637b4e8ac3663ad196cdfa2fab088201471f Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 29 May 2012 10:37:31 -0400 Subject: [PATCH] rediscovered start-group and end-group to make linker multi-pass. may not work on mac though, since it was beefing about these before, which was what made us take them out. need to test. --- nucleus/applications/utilities/makefile | 2 +- scripts/clam/cpp/rules.def | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nucleus/applications/utilities/makefile b/nucleus/applications/utilities/makefile index e38699f8..3b24f7a4 100644 --- a/nucleus/applications/utilities/makefile +++ b/nucleus/applications/utilities/makefile @@ -7,7 +7,7 @@ TYPE = application ifeq "$(OMIT_VERSIONS)" "" SOURCE += util_version.rc endif -LOCAL_LIBS_USED = application loggers mathematics processes textual timely configuration filesystem nodes structures basis +LOCAL_LIBS_USED = application basis configuration filesystem loggers mathematics nodes processes textual timely structures TARGETS = await_app_exit.exe bytedump.exe checker.exe dirtree.exe ini_edit.exe mdate.exe \ splitter.exe diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index ffb66602..7876b49f 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -284,9 +284,10 @@ COMPILER_FLAGS += $(HEADER_SEARCH_PATH:%=-I%) $(DEFINITIONS:%=-D%) $(UNDEFINITIO # to search and by adding all of the code libraries that are used. LOAD_FLAG_PREFIX += $(LIBRARY_SEARCH_PATH:%=$(LIBRARY_PATH_FLAG)%) ifeq "$(OP_SYSTEM)" "UNIX" -#mac no like these flags? -# LOAD_FLAG_PREFIX += -Xlinker --start-group -# LOAD_FLAG_SUFFIX += -Xlinker --end-group +# ifneq "$(COMPILER)" "GNU_DARWIN" + LOAD_FLAG_PREFIX += -Xlinker --start-group + LOAD_FLAG_SUFFIX += -Xlinker --end-group +# endif endif # had to switch from prefix to suffix recently. oddity. #LOAD_FLAG_PREFIX += $(LIBS_USED:%=$(LIBRARY_NAME_FLAG)%) -- 2.34.1