319495 - clean up Makefiles for command-line tools

Status: RESOLVED FIXED

(NSS :: Build, defect, P3)

Description

[Julien Pierre]

There are several problems in the current Makefiles for command-line tools :

1) in cmd/Makefile, there are a lot of legacy rules from the era export vs domestic builds. It's time to get rid of thme

2) in dbtest, rsaperf, tstclnt, vfychain and vfyserv, there are rules that add the following to LDFLAGS in debug builds only :

/subsystem:console /profile /debug /machine:I386 /incremental:no

The debug flag is redundant, as coreconf already has it.
If /subsystem was necessary, it would also be required for optimized builds, but it is not.

I don't think we need /profile at all.

/machine:i386 is not needed . Microsoft has moved to a model where they use different compiler binaries to target x86 and other architectures . So, the target is always implicitly dependent upon which CL / LINK you have in your path. When targetting x86_64, this flag actually gets in the way, so we need to get rid of it.

/incremental:no is not needed . Even though the default is for the linker to run in incremental mode, it is not harmful, as shown by the fact that the other tools that don't have this linker flag link and relink just fine.

Comment 1

[Julien Pierre]

Attachment: make proposed changes

Comment 2

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 205266 [details] [diff] [review]
make proposed changes

r=nelson

Comment 3

[Julien Pierre]

Thanks for the review, Nelson. I checked this in to the tip for 3.12 .

Checking in Makefile;
/cvsroot/mozilla/security/nss/cmd/Makefile,v  <--  Makefile
new revision: 1.6; previous revision: 1.5
done
Checking in dbtest/Makefile;
/cvsroot/mozilla/security/nss/cmd/dbtest/Makefile,v  <--  Makefile
new revision: 1.6; previous revision: 1.5
done
Checking in rsaperf/Makefile;
/cvsroot/mozilla/security/nss/cmd/rsaperf/Makefile,v  <--  Makefile
new revision: 1.5; previous revision: 1.4
done
Checking in shlibsign/Makefile;
/cvsroot/mozilla/security/nss/cmd/shlibsign/Makefile,v  <--  Makefile
new revision: 1.14; previous revision: 1.13
done
Checking in tstclnt/Makefile;
/cvsroot/mozilla/security/nss/cmd/tstclnt/Makefile,v  <--  Makefile
new revision: 1.6; previous revision: 1.5
done
Checking in vfychain/Makefile;
/cvsroot/mozilla/security/nss/cmd/vfychain/Makefile,v  <--  Makefile
new revision: 1.3; previous revision: 1.2
done
Checking in vfyserv/Makefile;
/cvsroot/mozilla/security/nss/cmd/vfyserv/Makefile,v  <--  Makefile
new revision: 1.4; previous revision: 1.3
done

Comment 4

[Nelson Bolyard (seldom reads bugmail)]

The checkin shown above included a change to one file that was not part of
the patch that I reviewed.  That was the checkin for shlibsign/Makefile.
That checkin broke the build.  I backed out the change for that one Makefile.
Hopefully the build will go green again.

Checking in Makefile;
/cvsroot/mozilla/security/nss/cmd/shlibsign/Makefile,v  <--  Makefile
new revision: 1.15; previous revision: 1.14

Comment 5

[Julien Pierre]

Sorry for the accidental checkin to shlibsign/Makefile . This was intended to fix bug 315793 . The patch is still under review by Wan-Teh . The reason the tinderboxes broke is because they are running with a 9-year old version of gmake (3.76) . The patch requires a 6-year old version, gmake 3.79 .

Comment 6

[Nelson Bolyard (seldom reads bugmail)]

Checked in on 3_11_BRANCH

Checking in dbtest/Makefile;   new revision: 1.5.28.1; previous revision: 1.5
Checking in rsaperf/Makefile;  new revision: 1.4.28.1; previous revision: 1.4
Checking in tstclnt/Makefile;  new revision: 1.5.28.1; previous revision: 1.5
Checking in vfychain/Makefile; new revision: 1.2.28.1; previous revision: 1.2
Checking in vfyserv/Makefile;  new revision: 1.3.28.1; previous revision: 1.3
Checking in Makefile;          new revision: 1.5.2.1;  previous revision: 1.5