Changeset 910bd98 in git
- Timestamp:
- Jun 28, 2021, 8:56:38 PM (3 years ago)
- Branches:
- master
- Children:
- 5c257a5
- Parents:
- 71eba5e
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r71eba5e r910bd98 2419 2419 @mkdir -p $(@D) 2420 2420 @echo ">> Building $@" 2421 ifeq ($(ARCH),aix5)2422 @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^2423 else2424 2421 ifeq ($(PLATFORM),macosx) 2425 # We need to make both the .dylib and the .so2426 2422 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2427 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)2428 ifeq ($(MACOSX_MINOR),4)2429 @ln -sf $@ $(subst .$(DllSuf),.so,$@)2430 endif2431 endif2432 2423 else 2433 2424 ifeq ($(PLATFORM),win32) … … 2438 2429 else 2439 2430 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2440 @$(MT_DLL)2441 endif2442 2431 endif 2443 2432 endif … … 2446 2435 @mkdir -p $(@D) 2447 2436 @echo ">> Building $@" 2448 ifeq ($(ARCH),aix5)2449 @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^2450 else2451 2437 ifeq ($(PLATFORM),macosx) 2452 # We need to make both the .dylib and the .so2453 2438 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2454 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)2455 ifeq ($(MACOSX_MINOR),4)2456 @ln -sf $@ $(subst .$(DllSuf),.so,$@)2457 endif2458 endif2459 2439 else 2460 2440 ifeq ($(PLATFORM),win32) … … 2465 2445 else 2466 2446 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 2467 @$(MT_DLL)2468 endif2469 2447 endif 2470 2448 endif … … 2473 2451 @mkdir -p $(@D) 2474 2452 @echo ">> Building $@" 2475 ifeq ($(ARCH),aix5)2476 @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^2477 else2478 2453 ifeq ($(PLATFORM),macosx) 2479 # We need to make both the .dylib and the .so2480 2454 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS) 2481 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)2482 ifeq ($(MACOSX_MINOR),4)2483 @ln -sf $@ $(subst .$(DllSuf),.so,$@)2484 endif2485 endif2486 2455 else 2487 2456 ifeq ($(PLATFORM),win32) … … 2492 2461 else 2493 2462 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS) 2494 @$(MT_DLL)2495 endif2496 2463 endif 2497 2464 endif -
doc/Makefile.arch
r71eba5e r910bd98 39 39 OPT2 = -g 40 40 else 41 ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),)42 OPT = -g43 OPT2 = -g44 else45 41 OPT = -O 46 42 OPT2 = -O2 47 endif48 43 endif 49 44 … … 52 47 ROOTLIBS := $(shell $(RC) --libs) 53 48 ROOTGLIBS := $(shell $(RC) --glibs) 54 HASTHREAD := $(shell $(RC) --has-thread) 55 ROOTCINT := rootcint 49 ROOTCLING := rootcling 56 50 57 51 ifeq ($(PLATFORM),macosx) 58 MACOSX_MINOR := $(shell sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2) 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)) 59 55 ifeq ($(MACOSX_DEPLOYMENT_TARGET),) 60 MACOSXTARGET := 10.$(MACOSX_MINOR)56 MACOSXTARGET := $(MACOSX_MAJOR).$(MACOSX_MINOR) 61 57 else 62 58 MACOSXTARGET := $(MACOSX_DEPLOYMENT_TARGET) … … 118 114 SOFLAGS = -shared 119 115 DllSuf = a 120 EXPLLINKLIBS = $(ROOT LIBS) $(ROOTGLIBS)116 EXPLLINKLIBS = $(ROOTGLIBS) 121 117 endif 122 118 … … 146 142 LDFLAGS = $(OPT) 147 143 SOFLAGS = -G 148 endif149 150 ifeq ($(ARCH),sgicc)151 # SGI152 CXX = CC -n32 -I/usr/include/CC.sgi153 CXXFLAGS = $(OPT)154 LD = CC -n32 -LANG:std -I/usr/include/CC.sgi155 LDFLAGS = $(OPT)156 SOFLAGS = -shared157 endif158 159 ifeq ($(ARCH),sgicc64)160 # SGI161 CXX = CC -64 -I/usr/include/CC.sgi162 CXXFLAGS = $(OPT)163 LD = CC -64 -LANG:std -I/usr/include/CC.sgi164 LDFLAGS = $(OPT)165 SOFLAGS = -shared166 endif167 168 ifeq ($(ARCH),sgigcc)169 # SGI 6.x with gcc170 CXX = g++171 CXXFLAGS = $(OPT) -Wall -fPIC172 LD = g++173 LDFLAGS = $(OPT) -Wl,-u,__builtin_new -Wl,-u,__builtin_delete -Wl,-u,__nw__FUiPv174 SOFLAGS = -shared175 endif176 177 ifeq ($(ARCH),sgin32gcc)178 # SGI 6.x with gcc for n32 ABI179 CXX = g++180 CXXFLAGS = $(OPT) -Wall -fPIC181 LD = g++182 LDFLAGS = $(OPT) -L/usr/lib32 -Wl,-woff,134 -lgen183 SOFLAGS = -shared184 endif185 186 ifeq ($(ARCH),alphagcc)187 # Alpha/OSF with gcc188 CXX = g++189 CXXFLAGS = $(OPT2) -Wall -fPIC190 LD = g++191 LDFLAGS = $(OPT2)192 SOFLAGS = -Wl,-expect_unresolved,* -shared193 endif194 195 ifeq ($(ARCH),alphacxx6)196 # Alpha/OSF with cxx6197 CXX = cxx198 CXXFLAGS = $(OPT)199 LD = cxx200 LDFLAGS = $(OPT)201 SOFLAGS = -shared -nocxxstd -Wl,-expect_unresolved,*,-msym202 144 endif 203 145 … … 282 224 endif 283 225 284 ifeq ($(ARCH),linuxalphagcc)285 # Alpha Linux with gcc286 CXX = g++287 CXXFLAGS = $(OPT2) -Wall -fPIC288 LD = g++289 LDFLAGS = $(OPT2)290 SOFLAGS = -shared291 endif292 293 ifeq ($(ARCH),linuxmips)294 # GNU/Linux on mips (BE/LE, O32/N32/N64) with gcc295 CXX = g++296 CXXFLAGS = $(OPT2) -Wall -fPIC297 LD = g++298 LDFLAGS = $(OPT2)299 SOFLAGS = -shared300 endif301 302 226 ifeq ($(ARCH),linuxhppa) 303 227 # GNU/Linux on hppa with gcc … … 318 242 endif 319 243 244 ifeq ($(ARCH),linuxarm64) 245 # ARMv8-A (AArch64) Linux with gcc and glibc 246 CXX = g++ 247 CXXFLAGS = $(OPT) -Wall -fPIC 248 LD = g++ 249 LDFLAGS = $(OPT) 250 SOFLAGS = -shared 251 endif 252 320 253 ifeq ($(ARCH),freebsd4) 321 254 # FreeBSD with glibc … … 360 293 LD = g++ 361 294 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) 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) 295 EXPLLINKLIBS = $(ROOTGLIBS) 366 296 DllSuf = so 367 else368 DllSuf = dylib369 endif370 ifneq ($(subst $(MACOSX_MINOR),,12),12)371 LD = g++372 endif373 297 SOFLAGS = -dynamiclib -single_module -install_name $(CURDIR)/ 374 298 endif … … 376 300 ifeq ($(ARCH),macosxicc) 377 301 # MacOS X with Intel icc compiler 378 ifeq ($(MACOSX_MINOR),5)379 MACOSX_MINOR := 4380 endif381 302 CXX = icc 382 303 CXXFLAGS = $(OPT) -fPIC -wd1476 383 304 LD = icpc 384 305 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) 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) 306 EXPLLINKLIBS = $(ROOTGLIBS) 389 307 DllSuf = so 390 else391 DllSuf = dylib392 endif393 308 SOFLAGS = -dynamiclib -single_module -install_name $(CURDIR)/ 394 309 endif … … 400 315 CXXFLAGS = $(OPT2) -pipe -Wall -W -Woverloaded-virtual 401 316 LD = g++ 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) 317 LDFLAGS = $(OPT2) -mmacosx-version-min=$(MACOSXTARGET) -Wl,-rpath,$(ROOTLIBDIR) 318 EXPLLINKLIBS = $(ROOTGLIBS) 407 319 DllSuf = so 408 else 409 DllSuf = dylib 410 endif 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 411 331 SOFLAGS = -dynamiclib -single_module -install_name $(CURDIR)/ 412 332 endif … … 426 346 LDOPT = -debug 427 347 else 428 ifneq ($(findstring debug, $(strip $(shell $(RC) --config))),)429 CXXOPT = -Z7430 LDOPT = -debug431 else432 348 CXXOPT = -O2 433 349 LDOPT = -opt:ref 434 endif435 350 endif 436 351 ROOTINCDIR := -I$(shell cygpath -m `$(RC) --incdir`) … … 440 355 SOFLAGS = -DLL 441 356 442 EXPLLINKLIBS = $(ROOT LIBS) $(ROOTGLIBS)357 EXPLLINKLIBS = $(ROOTGLIBS) 443 358 ifneq (,$(findstring $(VC_MAJOR),14 15)) 444 359 MT_EXE = mt -nologo -manifest $@.manifest -outputresource:$@\;1; rm -f $@.manifest … … 462 377 SOFLAGS = -shared -Wl,--enable-auto-image-base \ 463 378 -Wl,--export-all-symbols 464 EXPLLINKLIBS = $(ROOT LIBS) $(ROOTGLIBS)379 EXPLLINKLIBS = $(ROOTGLIBS) 465 380 endif 466 381 … … 471 386 CXXFLAGS += $(ROOTCFLAGS) 472 387 LDFLAGS += $(ROOTLDFLAGS) 473 LIBS = $(ROOTLIBS) $(SYSLIBS)474 GLIBS = $(ROOTGLIBS) $(SYSLIBS)388 LIBS = $(ROOTLIBS) 389 GLIBS = $(ROOTGLIBS) 475 390 476 391 ifneq ($(ALTCC),) -
doc/genMakefile.tcl
r71eba5e r910bd98 346 346 @mkdir -p $(@D) 347 347 @echo ">> Building $@" 348 ifeq ($(ARCH),aix5)349 @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^350 else351 348 ifeq ($(PLATFORM),macosx) 352 # We need to make both the .dylib and the .so353 349 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 354 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)355 ifeq ($(MACOSX_MINOR),4)356 @ln -sf $@ $(subst .$(DllSuf),.so,$@)357 endif358 endif359 350 else 360 351 ifeq ($(PLATFORM),win32) … … 365 356 else 366 357 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 367 @$(MT_DLL)368 endif369 358 endif 370 359 endif … … 373 362 @mkdir -p $(@D) 374 363 @echo ">> Building $@" 375 ifeq ($(ARCH),aix5)376 @$(MAKESHARED) $(OutPutOpt) $@ $(DELPHES_LIBS) -p 0 $^377 else378 364 ifeq ($(PLATFORM),macosx) 379 # We need to make both the .dylib and the .so380 365 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 381 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)382 ifeq ($(MACOSX_MINOR),4)383 @ln -sf $@ $(subst .$(DllSuf),.so,$@)384 endif385 endif386 366 else 387 367 ifeq ($(PLATFORM),win32) … … 392 372 else 393 373 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS) 394 @$(MT_DLL)395 endif396 374 endif 397 375 endif … … 400 378 @mkdir -p $(@D) 401 379 @echo ">> Building $@" 402 ifeq ($(ARCH),aix5)403 @$(MAKESHARED) $(OutPutOpt) $@ $(DISPLAY_LIBS) -p 0 $^404 else405 380 ifeq ($(PLATFORM),macosx) 406 # We need to make both the .dylib and the .so407 381 @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS) 408 ifneq ($(subst $(MACOSX_MINOR),,1234),1234)409 ifeq ($(MACOSX_MINOR),4)410 @ln -sf $@ $(subst .$(DllSuf),.so,$@)411 endif412 endif413 382 else 414 383 ifeq ($(PLATFORM),win32) … … 419 388 else 420 389 @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS) 421 @$(MT_DLL)422 endif423 390 endif 424 391 endif
Note:
See TracChangeset
for help on using the changeset viewer.