Changes in doc/Makefile.arch [910bd98:9582d01] in git
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
doc/Makefile.arch
r910bd98 r9582d01 39 39 OPT2 = -g 40 40 else 41 ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),) 42 OPT = -g 43 OPT2 = -g 44 else 41 45 OPT = -O 42 46 OPT2 = -O2 47 endif 43 48 endif 44 49 … … 47 52 ROOTLIBS := $(shell $(RC) --libs) 48 53 ROOTGLIBS := $(shell $(RC) --glibs) 49 ROOTCLING := rootcling 54 HASTHREAD := $(shell $(RC) --has-thread) 55 ROOTCINT := rootcint 50 56 51 57 ifeq ($(PLATFORM),macosx) 52 ROOTLIBDIR := $(shell $(RC) --libdir) 53 MACOSX_MAJOR := $(strip $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1)) 54 MACOSX_MINOR := $(strip $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2)) 58 MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2) 55 59 ifeq ($(MACOSX_DEPLOYMENT_TARGET),) 56 MACOSXTARGET := $(MACOSX_MAJOR).$(MACOSX_MINOR)60 MACOSXTARGET := 10.$(MACOSX_MINOR) 57 61 else 58 62 MACOSXTARGET := $(MACOSX_DEPLOYMENT_TARGET) … … 114 118 SOFLAGS = -shared 115 119 DllSuf = a 116 EXPLLINKLIBS = $(ROOT GLIBS)120 EXPLLINKLIBS = $(ROOTLIBS) $(ROOTGLIBS) 117 121 endif 118 122 … … 142 146 LDFLAGS = $(OPT) 143 147 SOFLAGS = -G 148 endif 149 150 ifeq ($(ARCH),sgicc) 151 # SGI 152 CXX = CC -n32 -I/usr/include/CC.sgi 153 CXXFLAGS = $(OPT) 154 LD = CC -n32 -LANG:std -I/usr/include/CC.sgi 155 LDFLAGS = $(OPT) 156 SOFLAGS = -shared 157 endif 158 159 ifeq ($(ARCH),sgicc64) 160 # SGI 161 CXX = CC -64 -I/usr/include/CC.sgi 162 CXXFLAGS = $(OPT) 163 LD = CC -64 -LANG:std -I/usr/include/CC.sgi 164 LDFLAGS = $(OPT) 165 SOFLAGS = -shared 166 endif 167 168 ifeq ($(ARCH),sgigcc) 169 # SGI 6.x with gcc 170 CXX = g++ 171 CXXFLAGS = $(OPT) -Wall -fPIC 172 LD = g++ 173 LDFLAGS = $(OPT) -Wl,-u,__builtin_new -Wl,-u,__builtin_delete -Wl,-u,__nw__FUiPv 174 SOFLAGS = -shared 175 endif 176 177 ifeq ($(ARCH),sgin32gcc) 178 # SGI 6.x with gcc for n32 ABI 179 CXX = g++ 180 CXXFLAGS = $(OPT) -Wall -fPIC 181 LD = g++ 182 LDFLAGS = $(OPT) -L/usr/lib32 -Wl,-woff,134 -lgen 183 SOFLAGS = -shared 184 endif 185 186 ifeq ($(ARCH),alphagcc) 187 # Alpha/OSF with gcc 188 CXX = g++ 189 CXXFLAGS = $(OPT2) -Wall -fPIC 190 LD = g++ 191 LDFLAGS = $(OPT2) 192 SOFLAGS = -Wl,-expect_unresolved,* -shared 193 endif 194 195 ifeq ($(ARCH),alphacxx6) 196 # Alpha/OSF with cxx6 197 CXX = cxx 198 CXXFLAGS = $(OPT) 199 LD = cxx 200 LDFLAGS = $(OPT) 201 SOFLAGS = -shared -nocxxstd -Wl,-expect_unresolved,*,-msym 144 202 endif 145 203 … … 224 282 endif 225 283 284 ifeq ($(ARCH),linuxalphagcc) 285 # Alpha Linux with gcc 286 CXX = g++ 287 CXXFLAGS = $(OPT2) -Wall -fPIC 288 LD = g++ 289 LDFLAGS = $(OPT2) 290 SOFLAGS = -shared 291 endif 292 293 ifeq ($(ARCH),linuxmips) 294 # GNU/Linux on mips (BE/LE, O32/N32/N64) with gcc 295 CXX = g++ 296 CXXFLAGS = $(OPT2) -Wall -fPIC 297 LD = g++ 298 LDFLAGS = $(OPT2) 299 SOFLAGS = -shared 300 endif 301 226 302 ifeq ($(ARCH),linuxhppa) 227 303 # GNU/Linux on hppa with gcc … … 242 318 endif 243 319 244 ifeq ($(ARCH),linuxarm64)245 # ARMv8-A (AArch64) Linux with gcc and glibc246 CXX = g++247 CXXFLAGS = $(OPT) -Wall -fPIC248 LD = g++249 LDFLAGS = $(OPT)250 SOFLAGS = -shared251 endif252 253 320 ifeq ($(ARCH),freebsd4) 254 321 # FreeBSD with glibc … … 293 360 LD = g++ 294 361 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) 295 EXPLLINKLIBS = $(ROOTGLIBS) 362 EXPLLINKLIBS = $(ROOTLIBS) $(ROOTGLIBS) 363 # The SOFLAGS will be used to create the .dylib, 364 # the .so will be created separately 365 ifeq ($(subst $(MACOSX_MINOR),,1234),1234) 296 366 DllSuf = so 367 else 368 DllSuf = dylib 369 endif 370 ifneq ($(subst $(MACOSX_MINOR),,12),12) 371 LD = g++ 372 endif 297 373 SOFLAGS = -dynamiclib -single_module -install_name $(CURDIR)/ 298 374 endif … … 300 376 ifeq ($(ARCH),macosxicc) 301 377 # MacOS X with Intel icc compiler 378 ifeq ($(MACOSX_MINOR),5) 379 MACOSX_MINOR := 4 380 endif 302 381 CXX = icc 303 382 CXXFLAGS = $(OPT) -fPIC -wd1476 304 383 LD = icpc 305 384 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) 306 EXPLLINKLIBS = $(ROOTGLIBS) 385 EXPLLINKLIBS = $(ROOTLIBS) $(ROOTGLIBS) 386 # The SOFLAGS will be used to create the .dylib, 387 # the .so will be created separately 388 ifeq ($(subst $(MACOSX_MINOR),,1234),1234) 307 389 DllSuf = so 390 else 391 DllSuf = dylib 392 endif 308 393 SOFLAGS = -dynamiclib -single_module -install_name $(CURDIR)/ 309 394 endif … … 315 400 CXXFLAGS = $(OPT2) -pipe -Wall -W -Woverloaded-virtual 316 401 LD = g++ 317 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) -Wl,-rpath,$(ROOTLIBDIR) 318 EXPLLINKLIBS = $(ROOTGLIBS) 402 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) 403 EXPLLINKLIBS = $(ROOTLIBS) $(ROOTGLIBS) 404 # The SOFLAGS will be used to create the .dylib, 405 # the .so will be created separately 406 ifeq ($(subst $(MACOSX_MINOR),,1234),1234) 319 407 DllSuf = so 320 SOFLAGS = -dynamiclib -single_module -install_name $(CURDIR)/ 321 endif 322 323 ifeq ($(ARCH),macosxarm64) 324 # Apple Silicon running macOS 11.x. 325 CXX = g++ 326 CXXFLAGS = $(OPT2) -pipe -Wall -W -Woverloaded-virtual 327 LD = g++ 328 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) -Wl,-rpath,$(ROOTLIBDIR) 329 EXPLLINKLIBS = $(ROOTGLIBS) 330 DllSuf = so 408 else 409 DllSuf = dylib 410 endif 331 411 SOFLAGS = -dynamiclib -single_module -install_name $(CURDIR)/ 332 412 endif … … 346 426 LDOPT = -debug 347 427 else 428 ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),) 429 CXXOPT = -Z7 430 LDOPT = -debug 431 else 348 432 CXXOPT = -O2 349 433 LDOPT = -opt:ref 434 endif 350 435 endif 351 436 ROOTINCDIR := -I$(shell cygpath -m `$(RC) --incdir`) … … 355 440 SOFLAGS = -DLL 356 441 357 EXPLLINKLIBS = $(ROOT GLIBS)442 EXPLLINKLIBS = $(ROOTLIBS) $(ROOTGLIBS) 358 443 ifneq (,$(findstring $(VC_MAJOR),14 15)) 359 444 MT_EXE = mt -nologo -manifest $@.manifest -outputresource:$@\;1; rm -f $@.manifest … … 377 462 SOFLAGS = -shared -Wl,--enable-auto-image-base \ 378 463 -Wl,--export-all-symbols 379 EXPLLINKLIBS = $(ROOT GLIBS)464 EXPLLINKLIBS = $(ROOTLIBS) $(ROOTGLIBS) 380 465 endif 381 466 … … 386 471 CXXFLAGS += $(ROOTCFLAGS) 387 472 LDFLAGS += $(ROOTLDFLAGS) 388 LIBS = $(ROOTLIBS) 389 GLIBS = $(ROOTGLIBS) 473 LIBS = $(ROOTLIBS) $(SYSLIBS) 474 GLIBS = $(ROOTGLIBS) $(SYSLIBS) 390 475 391 476 ifneq ($(ALTCC),)
Note:
See TracChangeset
for help on using the changeset viewer.